From f33f5d962eddbc75f3db8124b14f8a50d93cf625 Mon Sep 17 00:00:00 2001 From: feige <791364011@qq.com> Date: 星期日, 10 十一月 2024 19:37:55 +0800 Subject: [PATCH] 修改了bug --- zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 51 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 f32b01b..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; @@ -21,7 +18,6 @@ */ @TableName("z_info_user") @Data -@ToString public class ZInfoUser implements Serializable { private static final long serialVersionUID = 1L; @@ -151,6 +147,21 @@ @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; + /** * 鍥剧墖鍦板潃 */ @@ -164,12 +175,21 @@ /** * 鐖朵翰鐨刬d */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long fatherId; /** * 姣嶄翰鐨刬d */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long momId; + + /** + * 瀹舵棌鐨刬d + */ + private Integer clanId; /** * 鍑虹敓骞存湀鏃� @@ -179,6 +199,17 @@ private Date birth; /** + * 鍒涘缓鏃堕棿 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date createTime; + + /** + * 閭 + */ + private String email; + + /** * 涓汉鑳屾櫙鍥剧墖銆佽棰� */ private String url; @@ -186,13 +217,20 @@ /** * 瀹跺涵id */ - private String familyId; + private Long familyId; + + /** + * 瑙掕壊id + */ + private Long roleId; /** * 鍏朵粬瀹跺涵鎺堟潈id */ private String secondFamilyId; + + private Long sysId; /** * 浠f暟 */ @@ -200,11 +238,16 @@ private Integer identity; /** + * 閰嶅伓淇℃伅 + */ + @TableField(exist = false) + private ZInfoUser spouse; + + /** * 瀛愬垪琛� */ @TableField(exist = false) - List<ZInfoUser> childList; - + private List<ZInfoUser> childList; -- Gitblit v1.9.1