From c24698dacd5d43d99bbae35b430a189675a6532b Mon Sep 17 00:00:00 2001 From: feige <791364011@qq.com> Date: 星期二, 06 五月 2025 17:08:48 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 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..bb8ab99 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; @@ -152,6 +151,12 @@ @Excel(name = "鏄惁鏄湰瀹跺涵鎴愬憳",readConverterExp = "0=鍚�,1=鏄�") private Integer isMyFamily; + /** + * 鑷垜浠嬬粛 + */ + + @Excel(name = "鑷垜浠嬬粛") + private String selfIntroduction; @TableField(exist = false) private String familyName; @@ -172,12 +177,21 @@ /** * 鐖朵翰鐨刬d */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long fatherId; /** * 姣嶄翰鐨刬d */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long momId; + + /** + * 瀹舵棌鐨刬d + */ + private Integer clanId; /** * 鍑虹敓骞存湀鏃� @@ -218,7 +232,6 @@ private String secondFamilyId; - private Long sysId; /** * 浠f暟 @@ -237,7 +250,4 @@ */ @TableField(exist = false) private List<ZInfoUser> childList; - - - } -- Gitblit v1.9.1