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 | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 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 f32b01b..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;
@@ -151,6 +150,15 @@
@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;
+
/**
* 鍥剧墖鍦板潃
*/
@@ -172,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;
/**
* 涓汉鑳屾櫙鍥剧墖銆佽棰�
@@ -186,13 +210,21 @@
/**
* 瀹跺涵id
*/
- private String familyId;
+ private Long familyId;
+
+ /**
+ * 瑙掕壊id
+ */
+ private Long roleId;
/**
* 鍏朵粬瀹跺涵鎺堟潈id
*/
private String secondFamilyId;
+
+
+ private Long sysId;
/**
* 浠ｆ暟
*/
@@ -200,11 +232,16 @@
private Integer identity;
/**
+ * 閰嶅伓淇℃伅
+ */
+ @TableField(exist = false)
+ private ZInfoUser spouse;
+
+ /**
* 瀛愬垪琛�
*/
@TableField(exist = false)
- List<ZInfoUser> childList;
-
+ private List<ZInfoUser> childList;
--
Gitblit v1.9.1