From 46f46c73ef2cf1719f0de7c0258e6bcd4335966c Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期二, 25 七月 2023 22:37:08 +0800
Subject: [PATCH] 519648
---
zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 52 insertions(+), 2 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 927f2fd..699d7c5 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
@@ -139,6 +139,27 @@
@Excel(name = "鍏ㄧ敓鍛藉懆鏈�", dateFormat = "yyyy-MM-dd")
private Date deadDay;
+ @Excel(name = "鏄熷骇")
+ private String constellation;
+
+ @Excel(name = "寰俊鍙�")
+ private String wxNo;
+
+ @Excel(name = "qq鍙�")
+ private String qqNo;
+
+ @Excel(name = "鐢熻倴")
+ private String shengXiao;
+
+ @Excel(name = "鏄惁鏄湰瀹跺涵鎴愬憳",readConverterExp = "0=鍚�,1=鏄�")
+ private Integer isMyFamily;
+
+ @TableField(exist = false)
+ private String familyName;
+
+ @TableField(exist = false)
+ private String roleName;
+
/**
* 鍥剧墖鍦板潃
*/
@@ -167,6 +188,17 @@
private Date birth;
/**
+ * 鍒涘缓鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createTime;
+
+ /**
+ * 閭
+ */
+ private String email;
+
+ /**
* 涓汉鑳屾櫙鍥剧墖銆佽棰�
*/
private String url;
@@ -174,7 +206,12 @@
/**
* 瀹跺涵id
*/
- private String familyId;
+ private Long familyId;
+
+ /**
+ * 瑙掕壊id
+ */
+ private Long roleId;
/**
* 鍏朵粬瀹跺涵鎺堟潈id
@@ -182,10 +219,23 @@
private String secondFamilyId;
/**
+ * 浠ｆ暟
+ */
+ @TableField(exist = false)
+ private Integer identity;
+
+ /**
+ * 閰嶅伓淇℃伅
+ */
+ @TableField(exist = false)
+ private ZInfoUser spouse;
+
+ /**
* 瀛愬垪琛�
*/
@TableField(exist = false)
- List<ZInfoUser> childList;
+ private List<ZInfoUser> childList;
+
}
--
Gitblit v1.9.1