bonus
/
Bonus-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge remote-tracking branch 'origin/bonus-jyy-smart-canteen' into bonus-jyy-smart-canteen

This commit is contained in:
gaowdong 2025-07-03 10:51:50 +08:00
parent 71beb8a099 816fb0a0d7
commit fb63be8cf4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java
View File

@ -52,13 +52,13 @@ public class SysUser extends BaseEntity {
/** /**
* 用户账号 * 用户账号
*/ */
@Excel(name = "登录名称") @Excel(name = "用户名称")
private String userName; private String userName;
/** /**
* 用户昵称 * 用户昵称
*/ */
@Excel(name = "用户名称") @Excel(name = "用户昵称")
private String nickName; private String nickName;
/** /**

2
bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -222,7 +222,7 @@
</select> </select>
<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult"> <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 from sys_user u
left join sys_dept d on u.dept_id = d.dept_id 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 left join sys_user_role ur on u.user_id = ur.user_id