From 6850000519af3e8dfb135f97627b54c284aa7dbc Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 23 六月 2025 11:51:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 2 +-
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 5cedf8a..c79ac48 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -45,7 +45,7 @@
private Integer deptType;
@TableField("code")
@ApiModelProperty(value = "编号")
- private Integer code;
+ private String code;
@TableField("templateId")
@ApiModelProperty(value = "所属任务模板id")
private String templateId;
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 9b19055..f45d3b1 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -135,7 +135,7 @@
select u.user_id AS userId, u.dept_id AS deptId, u.user_name AS userName, u.nick_name AS nickName, u.email AS email, u.avatar AS avatar,
u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,
u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.ifBlack AS ifBlack, u.districtId AS districtId,u.business_dept_id AS businessDeptId,
- ur.role_id AS roleId,sr.role_name AS roleName,u.deptName as deptName,u.code
+ ur.role_id AS roleId,sr.role_name AS roleName,u.deptName as deptName,u.code,u.deptType,u.code,u.templateId,u.deptId
from sys_user u
left join sys_user_role ur on u.user_id = ur.user_id
left join sys_role sr on ur.role_id = sr.role_id
--
Gitblit v1.7.1