From 563001a6b1bab7ca0baa593d848f55bd7443c1e0 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 2 Jul 2025 17:20:28 +0800
Subject: [PATCH 1/2] fix bug 6657

---
 .../src/main/resources/mapper/system/SysUserMapper.xml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
index e30ba3a..d60c3ae 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -222,7 +222,7 @@
     </select>
 
     <select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
-        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time,u.is_built_in,
+        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time,u.is_built_in
         from sys_user u
         left join sys_dept d on u.dept_id = d.dept_id
         left join sys_user_role ur on u.user_id = ur.user_id

From 816fb0a0d7b47d1aa7cfcf85824b37b69992217a Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 2 Jul 2025 17:45:13 +0800
Subject: [PATCH 2/2] fix bug 6656

---
 .../src/main/java/com/bonus/system/api/domain/SysUser.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java
index 98e9718..8caf634 100644
--- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java
+++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java
@@ -52,13 +52,13 @@ public class SysUser extends BaseEntity {
     /**
      * 用户账号
      */
-    @Excel(name = "登录名称")
+    @Excel(name = "用户名称")
     private String userName;
 
     /**
      * 用户昵称
      */
-    @Excel(name = "用户名称")
+    @Excel(name = "用户昵称")
     private String nickName;
 
     /**