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 | 51 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 43 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 1974077..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;
@@ -154,6 +150,12 @@
@Excel(name = "鏄惁鏄湰瀹跺涵鎴愬憳",readConverterExp = "0=鍚�,1=鏄�")
private Integer isMyFamily;
+ @TableField(exist = false)
+ private String familyName;
+
+ @TableField(exist = false)
+ private String roleName;
+
/**
* 鍥剧墖鍦板潃
*/
@@ -167,12 +169,21 @@
/**
* 鐖朵翰鐨刬d
*/
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+
private Long fatherId;
/**
* 姣嶄翰鐨刬d
*/
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+
private Long momId;
+
+ /**
+ * 瀹舵棌鐨刬d
+ */
+ private Integer clanId;
/**
* 鍑虹敓骞存湀鏃�
@@ -182,6 +193,17 @@
private Date birth;
/**
+ * 鍒涘缓鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createTime;
+
+ /**
+ * 閭
+ */
+ private String email;
+
+ /**
* 涓汉鑳屾櫙鍥剧墖銆佽棰�
*/
private String url;
@@ -189,13 +211,21 @@
/**
* 瀹跺涵id
*/
- private String familyId;
+ private Long familyId;
+
+ /**
+ * 瑙掕壊id
+ */
+ private Long roleId;
/**
* 鍏朵粬瀹跺涵鎺堟潈id
*/
private String secondFamilyId;
+
+
+ private Long sysId;
/**
* 浠ｆ暟
*/
@@ -203,11 +233,16 @@
private Integer identity;
/**
+ * 閰嶅伓淇℃伅
+ */
+ @TableField(exist = false)
+ private ZInfoUser spouse;
+
+ /**
* 瀛愬垪琛�
*/
@TableField(exist = false)
- List<ZInfoUser> childList;
-
+ private List<ZInfoUser> childList;
--
Gitblit v1.9.1