From 513437f432c227191f7a05d41d9127f080f4659b Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期二, 12 九月 2023 17:22:30 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/swspkmas into zf1
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 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 53ad695..db31b62 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
@@ -29,6 +29,10 @@
@Excel(name = "部门编号", type = Type.IMPORT)
private Long deptId;
+ private Long districtId;
+
+ private String unit;
+
/** 用户账号 */
@Excel(name = "登录名称")
private String userName;
@@ -297,11 +301,29 @@
this.roleId = roleId;
}
+ public Long getDistrictId() {
+ return districtId;
+ }
+
+ public void setDistrictId(Long districtId) {
+ this.districtId = districtId;
+ }
+
+ public String getUnit() {
+ return unit;
+ }
+
+ public void setUnit(String unit) {
+ this.unit = unit;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("userId", getUserId())
.append("deptId", getDeptId())
+ .append("unit", getUnit())
+ .append("districtId", getDistrictId())
.append("userName", getUserName())
.append("nickName", getNickName())
.append("email", getEmail())
--
Gitblit v1.9.2