From b02beccf4567068cb47a3f1181a00039456c872d Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期三, 06 八月 2025 15:37:20 +0800
Subject: [PATCH] 用户修改姓名和电话同步修改uaid

---
 zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java |   36 +++++++++++++++++++++++++++++++-----
 1 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java b/zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java
index a143ca1..dabf4b9 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java
@@ -2,27 +2,43 @@
 
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excels;
+import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
 @Data
-public class sysUserAndUserInfo {
+public class sysUserAndUserInfo extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
 
     private Long userId;
 
+    @Excel(name = "鎵嬫満鍙风爜")
+    private String phonenumber;
+
+
+
+    /** 鐢ㄦ埛澶村儚 */
+    private String avatar;
+
+    /** 瀵嗙爜 */
+    private String password;
+
+    /** 鐢ㄦ埛鏄电О */
+    @Excel(name = "鐢ㄦ埛鏄电О")
+    private String nickName;
+
+
 
 
     /** 鐢ㄦ埛鏄电О */
     @Excel(name = "鐢ㄦ埛鍚嶇О")
-    private String nickName;
-
-
+    private String userName;
 
     /** 鐢ㄦ埛鎬у埆 */
     @Excel(name = "鐢ㄦ埛鎬у埆", readConverterExp = "0=鐢�,1=濂�,2=鏈煡")
@@ -52,7 +68,17 @@
 
     private Long spouseId;
 
-    private Long familyId;
+    private Long fid;
 
+    private Long mid;
     private Long sysId;
+
+
+    private Integer clanId;
+
+    /** 濠氬Щ鐘跺喌(0:鏈,1:宸插,2:绂诲) */
+    private Integer maritalStatus;
+
+    /** 鏄惁浼氬憳(0鍚� 1鏄�) 榛樿鍚�*/
+    private Integer paid;
 }

--
Gitblit v1.9.1