From f0792fca6d0874de97411af39c4d58d0c120412f Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期六, 09 十一月 2024 17:15:16 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend

---
 zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java |  104 +++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 98 insertions(+), 6 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 62434f5..095b1b3 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
@@ -1,8 +1,6 @@
 package com.ruoyi.domain;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-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;
@@ -11,6 +9,7 @@
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Version 1.0
@@ -19,7 +18,6 @@
  */
 @TableName("z_info_user")
 @Data
-@ToString
 public class ZInfoUser implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -129,20 +127,69 @@
     @Excel(name = "澶栫睄銆佸澶栫浉鍏宠瘉浠跺彿鐮�")
     private String idNo;
 
+
+    /**
+     * 鍏ㄧ敓鍛藉懆鏈�
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "鍏ㄧ敓鍛藉懆鏈�", dateFormat = "yyyy-MM-dd")
+    private Date deadDay;
+
+    @Excel(name = "鏄熷骇")
+    private String constellation;
+
+    @Excel(name = "寰俊鍙�")
+    private String wxNo;
+
+    @Excel(name = "qq鍙�")
+    private String qqNo;
+
+    @Excel(name = "鐢熻倴")
+    private String shengXiao;
+
+    @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;
+
     /**
      * 鍥剧墖鍦板潃
      */
     private String img;
 
     /**
+     * 閰嶅伓id
+     */
+    private Long spouseId;
+
+    /**
      * 鐖朵翰鐨刬d
      */
-    private Integer fatherId;
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+
+    private Long fatherId;
 
     /**
      * 姣嶄翰鐨刬d
      */
-    private Integer momId;
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+
+    private Long momId;
+
+    /**
+     * 瀹舵棌鐨刬d
+     */
+    private Integer clanId;
 
     /**
      * 鍑虹敓骞存湀鏃�
@@ -152,10 +199,55 @@
     private Date birth;
 
     /**
+     * 鍒涘缓鏃堕棿
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    /**
+     * 閭
+     */
+    private String email;
+
+    /**
      * 涓汉鑳屾櫙鍥剧墖銆佽棰�
      */
     private String url;
 
+    /**
+     * 瀹跺涵id
+     */
+    private Long familyId;
+
+    /**
+     * 瑙掕壊id
+     */
+    private Long roleId;
+
+    /**
+     * 鍏朵粬瀹跺涵鎺堟潈id
+     */
+    private String secondFamilyId;
+
+
+    private Long sysId;
+    /**
+     * 浠ｆ暟
+     */
+    @TableField(exist = false)
+    private Integer identity;
+
+    /**
+     * 閰嶅伓淇℃伅
+     */
+    @TableField(exist = false)
+    private ZInfoUser spouse;
+
+    /**
+     * 瀛愬垪琛�
+     */
+    @TableField(exist = false)
+    private List<ZInfoUser> childList;
 
 
 

--
Gitblit v1.9.1