From db69e6a02f18a3440dd77aef648b56a964b91021 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 06 八月 2024 19:23:11 +0800
Subject: [PATCH] 修改导入用户，注册bug
---
zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java | 76 ++++++++++++++++++++++++++++++++++++-
1 files changed, 73 insertions(+), 3 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 3d8e4af..b78ce3f 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
@@ -21,7 +21,6 @@
*/
@TableName("z_info_user")
@Data
-@ToString
public class ZInfoUser implements Serializable {
private static final long serialVersionUID = 1L;
@@ -131,10 +130,44 @@
@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;
+
/**
* 鍥剧墖鍦板潃
*/
private String img;
+
+ /**
+ * 閰嶅伓id
+ */
+ private Long spouseId;
/**
* 鐖朵翰鐨刬d
@@ -147,11 +180,27 @@
private Long momId;
/**
+ * 瀹舵棌鐨刬d
+ */
+ private Integer clanId;
+
+ /**
* 鍑虹敓骞存湀鏃�
*/
@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;
/**
* 涓汉鑳屾櫙鍥剧墖銆佽棰�
@@ -161,18 +210,39 @@
/**
* 瀹跺涵id
*/
- private String familyId;
+ private Long familyId;
+
+ /**
+ * 瑙掕壊id
+ */
+ private Long roleId;
/**
* 鍏朵粬瀹跺涵鎺堟潈id
*/
private String secondFamilyId;
+
+
+ private Long sysId;
+ /**
+ * 浠ｆ暟
+ */
+ @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