From b10f260189e5db5b89d9a85ce4fb08984d2aae2a Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期三, 20 十一月 2024 10:59:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java |   57 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 50 insertions(+), 7 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..442efe1 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
@@ -1,15 +1,14 @@
 package com.ruoyi.domain;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import lombok.Data;
 import lombok.ToString;
+import org.apache.ibatis.type.JdbcType;
 
 import java.io.Serializable;
+import java.sql.Timestamp;
 import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
@@ -21,7 +20,6 @@
  */
 @TableName("z_info_user")
 @Data
-@ToString
 public class ZInfoUser implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -153,6 +151,18 @@
 
     @Excel(name = "鏄惁鏄湰瀹跺涵鎴愬憳",readConverterExp = "0=鍚�,1=鏄�")
     private Integer isMyFamily;
+    /**
+     * 鑷垜浠嬬粛
+     */
+
+    @Excel(name = "鑷垜浠嬬粛")
+    private String selfIntroduction;
+
+    @TableField(exist = false)
+    private String familyName;
+
+    @TableField(exist = false)
+    private String roleName;
 
     /**
      * 鍥剧墖鍦板潃
@@ -167,12 +177,21 @@
     /**
      * 鐖朵翰鐨刬d
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+
     private Long fatherId;
 
     /**
      * 姣嶄翰鐨刬d
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+
     private Long momId;
+
+    /**
+     * 瀹舵棌鐨刬d
+     */
+    private Integer clanId;
 
     /**
      * 鍑虹敓骞存湀鏃�
@@ -182,6 +201,17 @@
     private Date birth;
 
     /**
+     * 鍒涘缓鏃堕棿
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    /**
+     * 閭
+     */
+    private String email;
+
+    /**
      * 涓汉鑳屾櫙鍥剧墖銆佽棰�
      */
     private String url;
@@ -189,13 +219,20 @@
     /**
      * 瀹跺涵id
      */
-    private String familyId;
+    private Long familyId;
+
+    /**
+     * 瑙掕壊id
+     */
+    private Long roleId;
 
     /**
      * 鍏朵粬瀹跺涵鎺堟潈id
      */
     private String secondFamilyId;
 
+
+    private Long sysId;
     /**
      * 浠ｆ暟
      */
@@ -203,10 +240,16 @@
     private Integer identity;
 
     /**
+     * 閰嶅伓淇℃伅
+     */
+    @TableField(exist = false)
+    private ZInfoUser spouse;
+
+    /**
      * 瀛愬垪琛�
      */
     @TableField(exist = false)
-    List<ZInfoUser> childList;
+    private List<ZInfoUser> childList;
 
 
 

--
Gitblit v1.9.1