From 353a35956f156b78beca56b08c1877455bb67a74 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期三, 20 五月 2026 09:21:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java
index 865fc4a..66f3a05 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java
@@ -13,6 +13,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* 鎹愮尞涓婃姤鍩虹瀵硅薄 service_donatebaseinfo_report
@@ -425,5 +426,21 @@
@Excel(name = "纭鏃堕棿", readConverterExp = "纭鏃堕棿")
private Date confirmTime;
+ @ApiModelProperty("鍏ラ櫌鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date entryTime;
+
+ @ApiModelProperty("椹冲洖绫诲瀷")
+ @Excel(name = "椹冲洖绫诲瀷")
+ private String rejectType;
+
+ /**
+ * 鏄惁涓婃姤0涓嶄笂鎶�1涓婃姤
+ */
+ @TableField(exist = false)
+ @ApiModelProperty("鏄惁鎹愮尞0涓嶆崘鐚�1鎹愮尞")
+ private Integer isDonate;
+
}
--
Gitblit v1.9.3