From 3ad8fb4e7cc1391e8090f3da6ffa9c48690a12a3 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 16 六月 2024 13:45:39 +0800
Subject: [PATCH] 修改了权限的代码

---
 zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java |   37 +++++++++++++++++++++++++++++++++----
 1 files changed, 33 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..f0cfd64 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;
+
     /**
      * 鍥剧墖鍦板潃
      */
@@ -182,6 +187,17 @@
     private Date birth;
 
     /**
+     * 鍒涘缓鏃堕棿
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    /**
+     * 閭
+     */
+    private String email;
+
+    /**
      * 涓汉鑳屾櫙鍥剧墖銆佽棰�
      */
     private String url;
@@ -189,13 +205,21 @@
     /**
      * 瀹跺涵id
      */
-    private String familyId;
+    private Long familyId;
+
+    /**
+     * 瑙掕壊id
+     */
+    private Long roleId;
 
     /**
      * 鍏朵粬瀹跺涵鎺堟潈id
      */
     private String secondFamilyId;
 
+
+
+    private Long sysId;
     /**
      * 浠f暟
      */
@@ -203,11 +227,16 @@
     private Integer identity;
 
     /**
+     * 閰嶅伓淇℃伅
+     */
+    @TableField(exist = false)
+    private ZInfoUser spouse;
+
+    /**
      * 瀛愬垪琛�
      */
     @TableField(exist = false)
-    List<ZInfoUser> childList;
-
+    private List<ZInfoUser> childList;
 
 
 

--
Gitblit v1.9.1