From b39a20d6b37f96e1d44c6c194ce56bd30593e3ad Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 29 八月 2024 22:20:31 +0800
Subject: [PATCH] 登录用用户昵称了

---
 zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java |   42 ++++++++++++++++++++++++++++++++++++++----
 1 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
index 1974077..b78ce3f 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
@@ -21,7 +21,6 @@
  */
 @TableName("z_info_user")
 @Data
-@ToString
 public class ZInfoUser implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -154,6 +153,12 @@
     @Excel(name = "鏄惁鏄湰瀹跺涵鎴愬憳",readConverterExp = "0=鍚�,1=鏄�")
     private Integer isMyFamily;
 
+    @TableField(exist = false)
+    private String familyName;
+
+    @TableField(exist = false)
+    private String roleName;
+
     /**
      * 鍥剧墖鍦板潃
      */
@@ -175,11 +180,27 @@
     private Long momId;
 
     /**
+     * 瀹舵棌鐨刬d
+     */
+    private Integer clanId;
+
+    /**
      * 鍑虹敓骞存湀鏃�
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "鍑虹敓鏃堕棿", dateFormat = "yyyy-MM-dd")
     private Date birth;
+
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    /**
+     * 閭
+     */
+    private String email;
 
     /**
      * 涓汉鑳屾櫙鍥剧墖銆佽棰�
@@ -189,13 +210,21 @@
     /**
      * 瀹跺涵id
      */
-    private String familyId;
+    private Long familyId;
+
+    /**
+     * 瑙掕壊id
+     */
+    private Long roleId;
 
     /**
      * 鍏朵粬瀹跺涵鎺堟潈id
      */
     private String secondFamilyId;
 
+
+
+    private Long sysId;
     /**
      * 浠f暟
      */
@@ -203,11 +232,16 @@
     private Integer identity;
 
     /**
+     * 閰嶅伓淇℃伅
+     */
+    @TableField(exist = false)
+    private ZInfoUser spouse;
+
+    /**
      * 瀛愬垪琛�
      */
     @TableField(exist = false)
-    List<ZInfoUser> childList;
-
+    private List<ZInfoUser> childList;
 
 
 

--
Gitblit v1.9.1