From 01a9d85aef5ed445acdc7f68798fa19efd480e2e Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 10 九月 2024 21:57:39 +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 |   18 +++++++++++++-----
 1 files changed, 13 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 699d7c5..077b262 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;
@@ -21,7 +18,6 @@
  */
 @TableName("z_info_user")
 @Data
-@ToString
 public class ZInfoUser implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -173,12 +169,21 @@
     /**
      * 鐖朵翰鐨刬d
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+
     private Long fatherId;
 
     /**
      * 姣嶄翰鐨刬d
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+
     private Long momId;
+
+    /**
+     * 瀹舵棌鐨刬d
+     */
+    private Integer clanId;
 
     /**
      * 鍑虹敓骞存湀鏃�
@@ -218,6 +223,9 @@
      */
     private String secondFamilyId;
 
+
+
+    private Long sysId;
     /**
      * 浠f暟
      */

--
Gitblit v1.9.1