From c5a89587afa921a098262ff37f6f211ac2776059 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 20 五月 2026 17:19:23 +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 | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 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 41705cd..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
@@ -29,11 +29,30 @@
private Long infoid;
/**
+ * 浣忛櫌鍙�
+ */
+ @ApiModelProperty("浣忛櫌鍙�")
+ private String inpatientno;
+
+ /**
+ * 鎵╁睍鍐呭
+ */
+ @ApiModelProperty("鎵╁睍鍐呭")
+ @Excel(name = "鎵╁睍鍐呭")
+ private String extracontent;
+
+ /**
* baseInfo鐨処D
*/
@ApiModelProperty("baseInfo鐨処D")
private Long id;
+ /**
+ * 鎹愮尞绫诲埆 鏍规嵁瀛楀吀sys_DonationCategory
+ */
+ @ApiModelProperty("鎹愮尞绫诲埆")
+ @Excel(name = "鎹愮尞绫诲埆")
+ private String donationcategory;
/**
* 璁板綍鐘舵��
@@ -115,7 +134,7 @@
*/
@ApiModelProperty("鍒嗛厤鐘舵�侊細0:鏈垎閰嶏紱1锛氬凡鍒嗛厤锛�2浣滃簾")
@Excel(name = "鍒嗛厤鐘舵�侊細0:鏈垎閰嶏紱1锛氬凡鍒嗛厤锛�2浣滃簾")
- private Long allocationStatus;
+ private String allocationStatus;
/**
* 鍒嗛厤鏃堕棿
@@ -152,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