From 17e08759071de47a7513d1cc1408c62d79713cd9 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 28 十月 2026 17:47:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorganVO.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorganVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorganVO.java
index 3d3a5f0..6dfda1a 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorganVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorganVO.java
@@ -53,6 +53,13 @@
private Long infoid;
/**
+ * 妗堜緥鏃堕棿锛堝叧鑱攕ervice_donatebaseinfo琛級
+ */
+ @ApiModelProperty("妗堜緥鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date donatetime;
+
+ /**
* 鎹愮尞浜哄悕瀛�
*/
@ApiModelProperty("鎹愮尞浜哄悕瀛�")
@@ -87,6 +94,7 @@
@Excel(name = "鍣ㄥ畼绫诲埆鍚嶇О 璇﹁瀛楀吀sys_Organ")
private String organname;
+
/**
* 鍣ㄥ畼搴旀敹璐圭敤
*/
@@ -98,8 +106,8 @@
* 璐圭敤褰曞叆鏃堕棿
*/
@ApiModelProperty("璐圭敤褰曞叆鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "璐圭敤褰曞叆鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "璐圭敤褰曞叆鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private Date organtime;
/**
@@ -171,7 +179,28 @@
*/
@ApiModelProperty("绁ㄦ嵁闄勪欢闆嗗悎")
@Excel(name = "绁ㄦ嵁闄勪欢闆嗗悎")
- private List<String> annexFilesList;
+ private List annexFilesList;
+
+ /**
+ * 鎺ユ敹鏃ユ湡
+ */
+ @ApiModelProperty("鎺ユ敹鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date receiveTime;
+
+ /**
+ * 鍣ㄥ畼鐘舵��
+ */
+ @ApiModelProperty("鍣ㄧ鐘舵�侊細1绉绘銆�2澶卞姛銆�3搴撳瓨銆�4宸茬Щ妞嶃��5寮冪敤銆�6鐩寸郴鍏嶉櫎銆�7涓嶈壇浜嬩欢")
+ @Excel(name = "鍣ㄧ鐘舵�侊細1绉绘銆�2澶卞姛銆�3搴撳瓨銆�4宸茬Щ妞嶃��5寮冪敤銆�6鐩寸郴鍏嶉櫎銆�7涓嶈壇浜嬩欢")
+ private String organState;
+
+ /**
+ * 鍣ㄥ畼鐘舵��
+ */
+ @ApiModelProperty("鍣ㄧ鏀惰垂鐘舵�侊細0鏈敹銆�1宸叉敹")
+ @Excel(name = "鍣ㄧ鏀惰垂鐘舵�侊細0鏈敹銆�1宸叉敹")
+ private String organChargeState;
}
--
Gitblit v1.9.3