From a2cc89fdd214c1a350d1f5b06447c155c47a5c25 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期一, 08 五月 2023 17:52:00 +0800
Subject: [PATCH] 888
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 6 ------
zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java | 8 ++++++++
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
index 3fdc182..341001e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
@@ -216,11 +216,5 @@
return zInfoUserService.listMySelfAndSpouse(id);
}
-
-
-
-
-
-
}
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 96e5bbc..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,6 +131,14 @@
@Excel(name = "澶栫睄銆佸澶栫浉鍏宠瘉浠跺彿鐮�")
private String idNo;
+
+ /**
+ * 鍏ㄧ敓鍛藉懆鏈�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鍏ㄧ敓鍛藉懆鏈�", dateFormat = "yyyy-MM-dd")
+ private Date deadDay;
+
/**
* 鍥剧墖鍦板潃
*/
--
Gitblit v1.9.1