From 727c924dd3e85aa4f277106dd1bd54a758fc3d22 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 17 六月 2025 14:50:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 7 ++++---
1 files changed, 4 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 77dc6b6..5cedf8a 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 = "登录名称")
@@ -191,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