From 72fe6f7da4a4cdcd4e086f5ca1a1e82b93551513 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 30 七月 2026 09:19:22 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationCompletionVO.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationCompletionVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationCompletionVO.java
index 5106455..a231727 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationCompletionVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationCompletionVO.java
@@ -26,7 +26,9 @@
private String idcardno;
private Long age;
private String ageunit;
- private String birthday;
+ private Long age2;
+ private String ageunit2;
+ private Date birthday;
private String nationality;
private String nation;
private String reporterno;
@@ -35,6 +37,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 Long dcid;
private Long infoid;
private String dcdonorno;
--
Gitblit v1.9.3