From d42096fd55c4b0caf84bb4f208b4e17534e158c1 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 21 五月 2026 15:34:49 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/opo-qd
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonateorganBaseInfoDTO.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonateorganBaseInfoDTO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonateorganBaseInfoDTO.java
index aed3895..8fd5174 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonateorganBaseInfoDTO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonateorganBaseInfoDTO.java
@@ -134,7 +134,7 @@
*/
@ApiModelProperty("鍒嗛厤鐘舵�侊細0:鏈垎閰嶏紱1锛氬凡鍒嗛厤锛�2浣滃簾")
@Excel(name = "鍒嗛厤鐘舵�侊細0:鏈垎閰嶏紱1锛氬凡鍒嗛厤锛�2浣滃簾")
- private Long allocationStatus;
+ private String allocationStatus;
/**
* 鍒嗛厤鏃堕棿
@@ -171,5 +171,24 @@
*/
@ApiModelProperty("鎹愮尞澶氫釜鍣ㄥ畼璇︽儏绠＄悊鍒楄〃")
private List<ServiceDonateorgan> serviceDonateorganList;
+
+ @ApiModelProperty("棰勮鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "棰勮鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date EstimatedTime;
+
+ /**
+ * 闄勪欢
+ */
+ @ApiModelProperty("闄勪欢")
+ @Excel(name = "闄勪欢")
+ private String fileName;
+
+ /**
+ * 鎵╁睍
+ */
+ @ApiModelProperty("鎵╁睍")
+ @Excel(name = "鎵╁睍")
+ private String extContent;
}
--
Gitblit v1.9.3