From 9289aa181144778637d18a3f727663a10b5195cc Mon Sep 17 00:00:00 2001
From: zhangf <1603559716@qq.com>
Date: 星期一, 24 六月 2024 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/master' into zf1
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 72 ++++++++++++++++++++++++++++++++++++
1 files changed, 72 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..32e5ee7 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
@@ -3,6 +3,9 @@
import java.util.Date;
import java.util.List;
import javax.validation.constraints.*;
+
+import com.ruoyi.common.core.domain.model.SysDistrictVo;
+import com.ruoyi.common.core.domain.model.TrainingInstitutionVo;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -28,6 +31,12 @@
/** 部门ID */
@Excel(name = "部门编号", type = Type.IMPORT)
private Long deptId;
+ /**
+ * 区域
+ */
+ private Long districtId;
+
+ private String unit;
/** 用户账号 */
@Excel(name = "登录名称")
@@ -88,6 +97,19 @@
/** 角色ID */
private Long roleId;
+
+ /**
+ * 身份证
+ */
+ private String idCard;
+ /***
+ * 机构ids
+ */
+ private Long[] institutionIds;
+
+ private SysDistrictVo district;
+
+ private List<TrainingInstitutionVo> institutions;
public SysUser()
{
@@ -297,11 +319,61 @@
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;
+ }
+
+ public String getIdCard() {
+ return idCard;
+ }
+
+ public void setIdCard(String idCard) {
+ this.idCard = idCard;
+ }
+
+ public SysDistrictVo getDistrict() {
+ return district;
+ }
+
+ public void setDistrict(SysDistrictVo district) {
+ this.district = district;
+ }
+
+ public Long[] getInstitutionIds() {
+ return institutionIds;
+ }
+
+ public void setInstitutionIds(Long[] institutionIds) {
+ this.institutionIds = institutionIds;
+ }
+
+ public List<TrainingInstitutionVo> getInstitutions() {
+ return institutions;
+ }
+
+ public void setInstitutions(List<TrainingInstitutionVo> institutions) {
+ this.institutions = institutions;
+ }
+
@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