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 | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 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 33cef64..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;
@@ -153,6 +149,12 @@
@Excel(name = "鏄惁鏄湰瀹跺涵鎴愬憳",readConverterExp = "0=鍚�,1=鏄�")
private Integer isMyFamily;
+ /**
+ * 鑷垜浠嬬粛
+ */
+
+ @Excel(name = "鑷垜浠嬬粛")
+ private String selfIntroduction;
@TableField(exist = false)
private String familyName;
@@ -173,12 +175,21 @@
/**
* 鐖朵翰鐨刬d
*/
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+
private Long fatherId;
/**
* 姣嶄翰鐨刬d
*/
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+
private Long momId;
+
+ /**
+ * 瀹舵棌鐨刬d
+ */
+ private Integer clanId;
/**
* 鍑虹敓骞存湀鏃�
@@ -186,6 +197,17 @@
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "鍑虹敓鏃堕棿", dateFormat = "yyyy-MM-dd")
private Date birth;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createTime;
+
+ /**
+ * 閭
+ */
+ private String email;
/**
* 涓汉鑳屾櫙鍥剧墖銆佽棰�
@@ -207,6 +229,8 @@
*/
private String secondFamilyId;
+
+ private Long sysId;
/**
* 浠ｆ暟
*/
--
Gitblit v1.9.1