From 8e93f63d7eab5c4f5d193763cbb2e81ea5476923 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期日, 16 七月 2023 21:03:59 +0800
Subject: [PATCH] 559
---
zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 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 96e5bbc..33cef64 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
@@ -131,6 +131,35 @@
@Excel(name = "澶栫睄銆佸澶栫浉鍏宠瘉浠跺彿鐮�")
private String idNo;
+
+ /**
+ * 鍏ㄧ敓鍛藉懆鏈�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @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;
+
/**
* 鍥剧墖鍦板潃
*/
@@ -166,7 +195,12 @@
/**
* 瀹跺涵id
*/
- private String familyId;
+ private Long familyId;
+
+ /**
+ * 瑙掕壊id
+ */
+ private Long roleId;
/**
* 鍏朵粬瀹跺涵鎺堟潈id
@@ -174,10 +208,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