From b019df4914f99aeb6b6c0ff111b1c8a4424d3331 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期三, 17 五月 2023 10:36:52 +0800
Subject: [PATCH] 调整了字段顺序与前端对应，添加了发生时间
---
zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 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 10d5efb..927f2fd 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
@@ -1,6 +1,7 @@
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.fasterxml.jackson.annotation.JsonFormat;
@@ -11,6 +12,7 @@
import java.io.Serializable;
import java.time.LocalDate;
import java.util.Date;
+import java.util.List;
/**
* @Version 1.0
@@ -118,19 +120,44 @@
private String position;
/**
+ * 鎷ユ湁澶栫睄銆佸澶栨案涔呭眳鐣欐潈鎴栬�呴暱鏈熷眳鐣欒鍙殑鎯呭喌,1锛氭湁銆�0锛氭病鏈�
+ */
+ @Excel(name="鎷ユ湁澶栫睄銆佸澶栨案涔呭眳鐣欐潈鎴栬�呴暱鏈熷眳鐣欒鍙殑鎯呭喌",readConverterExp = "0=娌℃湁,1=鏈�")
+ private Integer outStatus;
+
+ /**
+ * 澶栫睄銆佸澶栫浉鍏宠瘉浠跺彿鐮�
+ */
+ @Excel(name = "澶栫睄銆佸澶栫浉鍏宠瘉浠跺彿鐮�")
+ private String idNo;
+
+
+ /**
+ * 鍏ㄧ敓鍛藉懆鏈�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鍏ㄧ敓鍛藉懆鏈�", dateFormat = "yyyy-MM-dd")
+ private Date deadDay;
+
+ /**
* 鍥剧墖鍦板潃
*/
private String img;
/**
+ * 閰嶅伓id
+ */
+ private Long spouseId;
+
+ /**
* 鐖朵翰鐨刬d
*/
- private Integer fatherId;
+ private Long fatherId;
/**
* 姣嶄翰鐨刬d
*/
- private Integer momId;
+ private Long momId;
/**
* 鍑虹敓骞存湀鏃�
@@ -144,4 +171,21 @@
*/
private String url;
+ /**
+ * 瀹跺涵id
+ */
+ private String familyId;
+
+ /**
+ * 鍏朵粬瀹跺涵鎺堟潈id
+ */
+ private String secondFamilyId;
+
+ /**
+ * 瀛愬垪琛�
+ */
+ @TableField(exist = false)
+ List<ZInfoUser> childList;
+
+
}
--
Gitblit v1.9.1