From f610e1425f1e5ff2cb88b17312b24121fd2fa6a5 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 09 九月 2025 20:31:37 +0800
Subject: [PATCH] 同一用户 同步婚姻
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 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 375730f..e9b9959 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,8 @@
import java.util.Date;
import java.util.List;
import javax.validation.constraints.*;
+
+import lombok.Getter;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -55,7 +57,7 @@
/** 瀵嗙爜 */
private String password;
- /** 甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛� */
+ /** 甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤 2鍒犻櫎 3寮傚父 4璇曠敤鏈熺粨鏉燂級 */
@Excel(name = "甯愬彿鐘舵��", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
private String status;
@@ -71,10 +73,10 @@
private Date loginDate;
/** 閮ㄩ棬瀵硅薄 */
- @Excels({
- @Excel(name = "閮ㄩ棬鍚嶇О", targetAttr = "deptName", type = Type.EXPORT),
- @Excel(name = "閮ㄩ棬璐熻矗浜�", targetAttr = "leader", type = Type.EXPORT)
- })
+// @Excels({
+// @Excel(name = "閮ㄩ棬鍚嶇О", targetAttr = "deptName", type = Type.EXPORT),
+// @Excel(name = "閮ㄩ棬璐熻矗浜�", targetAttr = "leader", type = Type.EXPORT)
+// })
private SysDept dept;
/** 瑙掕壊瀵硅薄 */
@@ -88,6 +90,29 @@
/** 瑙掕壊ID */
private Long roleId;
+
+ /**鏄惁浼氬憳 0鍚� 1鏄�*/
+ private Integer paid;
+
+ public Integer getPaid() {
+ return paid;
+ }
+
+ public void setPaid(Integer paid) {
+ this.paid = paid;
+ }
+
+
+
+ public Integer getClanId() {
+ return clanId;
+ }
+
+ private Integer clanId;
+
+ public void setClanId(Integer clanId) {
+ this.clanId = clanId;
+ }
public SysUser()
{
@@ -117,6 +142,7 @@
public static boolean isAdmin(Long userId)
{
//1鍙风敤鎴峰氨鏄鐞嗗憳
+ //杩欓噷闇�瑕佷慨鏀规垚绠＄悊鍛橈紝鏌ヨ鏁版嵁搴�
return userId != null && 1L == userId;
}
@@ -302,7 +328,9 @@
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("userId", getUserId())
- .append("deptId", getDeptId())
+ .append("clanId", getClanId())
+
+ .append("deptId", getDeptId())
.append("userName", getUserName())
.append("nickName", getNickName())
.append("email", getEmail())
@@ -320,6 +348,7 @@
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("dept", getDept())
+ .append("paid",getPaid())
.toString();
}
}
--
Gitblit v1.9.1