From e5cb65e56ca20f10aa581edfd26e13a114b590f4 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期三, 17 五月 2023 15:16:44 +0800
Subject: [PATCH] 合并了一个方法
---
zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java | 25 +++++++++++++++++++++++--
1 files changed, 23 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 645a115..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
@@ -129,20 +131,33 @@
@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;
/**
* 鍑虹敓骞存湀鏃�
@@ -166,5 +181,11 @@
*/
private String secondFamilyId;
+ /**
+ * 瀛愬垪琛�
+ */
+ @TableField(exist = false)
+ List<ZInfoUser> childList;
+
}
--
Gitblit v1.9.1