From 1ff85b6e1210b47d4790f866ba59fd50600b3fb4 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 30 十月 2025 10:49:46 +0800
Subject: [PATCH] 修改代码

---
 ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/RelativeConfirmationVO.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/RelativeConfirmationVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/RelativeConfirmationVO.java
index e210c1b..11cf8fd 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/RelativeConfirmationVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/RelativeConfirmationVO.java
@@ -16,8 +16,10 @@
     private Long idcardtype;
     private String idcardno;
     private Long Age;
-    private String birthday;
+    private Long Age2;
+    private Date birthday;
     private String ageunit;
+    private String ageunit2;
     private String phone;
     private String nationality;
     private String nativeplace;
@@ -42,6 +44,9 @@
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date reporttime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date donatetime;
     private String donorno;
     private String treatmenthospitalno;
     private String treatmenthospitalname;
@@ -80,8 +85,8 @@
     private String kinship;
     private Long kinship_childrennum;
     private String kinshipconfirmationsign;
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    //    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date signdate;
     private Long delFlag;
     private String createBy;
@@ -104,6 +109,7 @@
     private String city;
     private String operatorno;
     private String operatorname;
+    private String work;
     private Integer workflow;
     private Integer terminationCase;
 }

--
Gitblit v1.9.3