From 349617384c7334699043e1f8a8a235c47f3a6b1c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 14 八月 2026 16:51:47 +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/DonateOrganVO.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonateOrganVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonateOrganVO.java
index 78498d5..10edf5f 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonateOrganVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonateOrganVO.java
@@ -16,9 +16,11 @@
private String sex;
private Long idcardtype;
private String idcardno;
- private String age;
+ private Long age;
private String ageunit;
- private String birthday;
+ private Long age2;
+ private String ageunit2;
+ private Date birthday;
private String phone;
private String nationality;
private String nativeplace;
@@ -70,4 +72,25 @@
private Date update_time;
private String abandonreason;
private String reallocationreason;
+ private String leaderno;
+ private String leadername;
+ private String businessarea;
+ private String gainHospitalname;
+ private Long sort;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date startorgangettime;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endorgangettime;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date starttransplanttime;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endtransplanttime;
}
--
Gitblit v1.9.3