From b88b42be258535e65d38888823ac85fd8467b571 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期一, 02 十一月 2026 14:02:11 +0800
Subject: [PATCH] 已收金额,未收金额钻取数据列表

---
 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorganVO.java |   34 +++++++++++++++++++++++++++++++---
 1 files changed, 31 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 bed40be..8c63955 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("鎹愮尞浜哄悕瀛�")
@@ -88,6 +95,13 @@
     private String organname;
 
     /**
+     * 浠樻鍣ㄥ畼鍚嶇О
+     */
+    @ApiModelProperty("浠樻鍣ㄥ畼鍚嶇О")
+    @Excel(name = "浠樻鍣ㄥ畼鍚嶇О")
+    private String payOrganName;
+
+    /**
      * 鍣ㄥ畼搴旀敹璐圭敤
      */
     @ApiModelProperty("鍣ㄥ畼搴旀敹璐圭敤")
@@ -98,8 +112,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;
 
     /**
@@ -177,8 +191,22 @@
      * 鎺ユ敹鏃ユ湡
      */
     @ApiModelProperty("鎺ユ敹鏃ユ湡")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date receiveTime;
 
+    /**
+     * 鍣ㄥ畼鐘舵��
+     */
+    @ApiModelProperty("鍣ㄧ鐘舵�侊細1绉绘銆�2寮冪敤銆�3搴撳瓨銆�4澶卞姛銆�5鐩寸郴鍏嶉櫎銆�6涓嶈壇浜嬩欢")
+    @Excel(name = "鍣ㄧ鐘舵�侊細1绉绘銆�2寮冪敤銆�3搴撳瓨銆�4澶卞姛銆�5鐩寸郴鍏嶉櫎銆�6涓嶈壇浜嬩欢")
+    private String organState;
+
+    /**
+     * 鍣ㄥ畼鐘舵��
+     */
+    @ApiModelProperty("鍣ㄧ鏀惰垂鐘舵�侊細0鏈敹銆�1宸叉敹")
+    @Excel(name = "鍣ㄧ鏀惰垂鐘舵�侊細0鏈敹銆�1宸叉敹")
+    private String organChargeState;
+
 }
 

--
Gitblit v1.9.3