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-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 9fb40b1..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
@@ -33,7 +33,8 @@
/** 部门ID */
//@Excel(name = "部门编号", type = Type.IMPORT)
@ApiModelProperty(value = "部门id")
- private Long deptId;
+ @TableField("deptId")
+ private String deptId;
/** 用户账号 */
//@Excel(name = "登录名称")
@@ -42,6 +43,9 @@
@TableField("dept_type")
@ApiModelProperty(value = "部门类型 1项目部 2部门")
private Integer deptType;
+ @TableField("code")
+ @ApiModelProperty(value = "编号")
+ private String code;
@TableField("templateId")
@ApiModelProperty(value = "所属任务模板id")
private String templateId;
@@ -188,12 +192,12 @@
return userId != null && 1L == userId;
}
- public Long getDeptId()
+ public String getDeptId()
{
return deptId;
}
- public void setDeptId(Long deptId)
+ public void setDeptId(String deptId)
{
this.deptId = deptId;
}
--
Gitblit v1.7.1