From b44e27d3cca665d55e86c1a46d03aa560bcf0774 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期四, 15 十月 2026 16:59:51 +0800
Subject: [PATCH] 捐献基础修改保存判断
---
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 0634e9c..941b6e2 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
@@ -6,6 +6,7 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -30,144 +31,189 @@
* 鐢ㄦ埛ID
*/
@Excel(name = "鐢ㄦ埛搴忓彿", cellType = ColumnType.NUMERIC, prompt = "鐢ㄦ埛缂栧彿")
+ @ApiModelProperty("涓婚敭鑷")
private Long userId;
/**
* 閮ㄩ棬ID
*/
@Excel(name = "閮ㄩ棬缂栧彿", type = Type.IMPORT)
+ @ApiModelProperty("閮ㄩ棬缂栧彿")
private Long deptId;
/**
* 寰俊openID
*/
@Excel(name = "寰俊openId")
+ @ApiModelProperty("寰俊openId")
private String openid;
/**
* 鐢ㄦ埛璐﹀彿
*/
@Excel(name = "鐧诲綍鍚嶇О")
+ @ApiModelProperty("鐧诲綍鍚嶇О")
private String userName;
/**
* 鐢ㄦ埛鏄电О
*/
@Excel(name = "鐢ㄦ埛鍚嶇О")
+ @ApiModelProperty("鐢ㄦ埛鍚嶇О")
private String nickName;
+
+ /**
+ * 鐢ㄦ埛绫诲瀷锛�00绠＄悊鍛橈級
+ */
+ @Excel(name = "鐢ㄦ埛绫诲瀷锛�00绠＄悊鍛橈級")
+ @ApiModelProperty("鐢ㄦ埛绫诲瀷锛�00绠＄悊鍛橈級")
+ private String userType;
/**
* 鐢ㄦ埛閭
*/
@Excel(name = "鐢ㄦ埛閭")
+ @ApiModelProperty("鐢ㄦ埛閭")
private String email;
/**
* 鎵嬫満鍙风爜
*/
@Excel(name = "鎵嬫満鍙风爜")
+ @ApiModelProperty("鎵嬫満鍙风爜")
private String phonenumber;
/**
* 鐢ㄦ埛鎬у埆
*/
@Excel(name = "鐢ㄦ埛鎬у埆", readConverterExp = "0=鐢�,1=濂�,2=鏈煡")
+ @ApiModelProperty("鐢ㄦ埛鎬у埆")
private String sex;
/**
* 鐢ㄦ埛澶村儚
*/
+ @ApiModelProperty("鐢ㄦ埛澶村儚")
private String avatar;
/**
* 瀵嗙爜
*/
+ @ApiModelProperty("瀵嗙爜")
private String password;
/**
* 鐩愬姞瀵�
*/
+ @ApiModelProperty("鍔犲瘑")
private String salt;
/**
* 甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
@Excel(name = "甯愬彿鐘舵��", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
+ @ApiModelProperty("甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�")
private String status;
/**
* 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�
*/
+ @ApiModelProperty("鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�")
private Integer delFlag;
/**
* 鏈�鍚庣櫥褰旾P
*/
@Excel(name = "鏈�鍚庣櫥褰旾P", type = Type.EXPORT)
+ @ApiModelProperty("鏈�鍚庣櫥褰旾P")
private String loginIp;
/**
* 鏈�鍚庣櫥褰曟椂闂�
*/
@Excel(name = "鏈�鍚庣櫥褰曟椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
+ @ApiModelProperty("鏈�鍚庣櫥褰曟椂闂�")
private Date loginDate;
/**
* 鎶ラ攢绾у埆
*/
@Excel(name = "鎶ラ攢绾у埆")
+ @ApiModelProperty("鎶ラ攢绾у埆")
private Integer standardlevel;
/**
* 閮ㄩ棬瀵硅薄
*/
+ @ApiModelProperty("閮ㄩ棬瀵硅薄")
@Excels({@Excel(name = "閮ㄩ棬鍚嶇О", targetAttr = "deptName", type = Type.EXPORT), @Excel(name = "閮ㄩ棬璐熻矗浜�", targetAttr = "leader", type = Type.EXPORT)})
private SysDept dept;
/**
* 瑙掕壊瀵硅薄
*/
+ @ApiModelProperty("瑙掕壊瀵硅薄")
private List<SysRole> roles;
/**
* 瑙掕壊缁�
*/
+ @ApiModelProperty("瑙掕壊缁�")
private Long[] roleIds;
/**
* 宀椾綅缁�
*/
+ @ApiModelProperty("宀椾綅缁�")
private Long[] postIds;
/**
* 瑙掕壊ID
*/
+ @ApiModelProperty("瑙掕壊ID")
private Long roleId;
/**
* 閿欒娆℃暟
*/
+ @ApiModelProperty("閿欒娆℃暟")
private int errorNums;
/**
* 閿欒鏃堕棿
*/
+ @ApiModelProperty("閿欒鏃堕棿")
private String errorTimes;
/**
* 閽夐拤userID
*/
+ @ApiModelProperty("閽夐拤userID")
private String dingUserId;
/**
* 鍗忚皟鍛樼紪鍙�
*/
+ @ApiModelProperty("鍗忚皟鍛樼紪鍙�")
private String coordinatorNo;
/**
* 鍗忚皟鍛樺鍚�
*/
+ @ApiModelProperty("鍗忚皟鍛樺鍚�")
private String coordinatorName;
+
+ /**
+ * 宸ヤ綔鍗曚綅ID
+ */
+ @ApiModelProperty("宸ヤ綔鍗曚綅ID")
+ private long orgId;
+
+ /**
+ * 宸ヤ綔鍗曚綅ID
+ */
+ @ApiModelProperty("宸ヤ綔鍗曚綅")
+ private String orgName;
public SysUser() {
@@ -266,6 +312,16 @@
public void setUserName(String userName) {
this.userName = userName;
+ }
+
+
+
+ public String getUserType() {
+ return userType;
+ }
+
+ public void setUserType(String userType) {
+ this.userType = userType;
}
@Email(message = "閭鏍煎紡涓嶆纭�")
@@ -402,6 +458,22 @@
this.roleId = roleId;
}
+ public Long getOrgId() {
+ return orgId;
+ }
+
+ public void setOrgId(Long orgId) {
+ this.orgId = orgId;
+ }
+
+ public String getOrgName() {
+ return orgName;
+ }
+
+ public void setOrgName(String orgName) {
+ this.orgName = orgName;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("userId", getUserId()).append("deptId", getDeptId()).append("userName", getUserName()).append("nickName", getNickName()).append("email", getEmail()).append("phonenumber", getPhonenumber()).append("sex", getSex()).append("avatar", getAvatar()).append("password", getPassword()).append("salt", getSalt()).append("status", getStatus()).append("delFlag", getDelFlag()).append("loginIp", getLoginIp()).append("loginDate", getLoginDate()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("remark", getRemark()).append("dept", getDept()).toString();
--
Gitblit v1.9.3