From b4895bdc5d9268e55c0023b92cc7c2d68ba33e46 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 05 十一月 2024 10:07:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 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 f0cfd64..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,9 +1,6 @@
 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;
@@ -152,6 +149,12 @@
 
     @Excel(name = "鏄惁鏄湰瀹跺涵鎴愬憳",readConverterExp = "0=鍚�,1=鏄�")
     private Integer isMyFamily;
+    /**
+     * 鑷垜浠嬬粛
+     */
+
+    @Excel(name = "鑷垜浠嬬粛")
+    private String selfIntroduction;
 
     @TableField(exist = false)
     private String familyName;
@@ -172,12 +175,21 @@
     /**
      * 鐖朵翰鐨刬d
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+
     private Long fatherId;
 
     /**
      * 姣嶄翰鐨刬d
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+
     private Long momId;
+
+    /**
+     * 瀹舵棌鐨刬d
+     */
+    private Integer clanId;
 
     /**
      * 鍑虹敓骞存湀鏃�
@@ -216,7 +228,6 @@
      * 鍏朵粬瀹跺涵鎺堟潈id
      */
     private String secondFamilyId;
-
 
 
     private Long sysId;

--
Gitblit v1.9.1