From 2cb2d3fcde8ab4cd3df812c4b19bb09dda977e53 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 16 五月 2025 11:59:53 +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/RelativeConfirmationVO.java | 5 +++++
1 files changed, 5 insertions(+), 0 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 869ec70..4ef4b85 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
@@ -42,6 +42,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;
@@ -104,4 +107,6 @@
private String city;
private String operatorno;
private String operatorname;
+ private Integer workflow;
+ private Integer terminationCase;
}
--
Gitblit v1.9.3