From 462c16ca4ec52bdea6cbb35514e8fd78d6b5f38c Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期三, 17 五月 2023 15:20:00 +0800
Subject: [PATCH] 合并不行
---
zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 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..927f2fd 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
@@ -131,12 +131,25 @@
@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 Long fatherId;
--
Gitblit v1.9.1