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/DonatebaseinfoProgressDTO.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonatebaseinfoProgressDTO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonatebaseinfoProgressDTO.java
index 4633e8c..d07e725 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonatebaseinfoProgressDTO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonatebaseinfoProgressDTO.java
@@ -220,7 +220,7 @@
 
     @ApiModelProperty("缁堟妗堜緥鍘熷洜")
     @Excel(name = "缁堟妗堜緥")
-    private Integer terminationResult;
+    private String terminationResult;
 
 
     @ApiModelProperty("缁堟鍘熷洜锛�1濂借浆   2姝讳骸   3涓嶇鍚堟崘鐚爣鍑�  4瀹跺睘鏀惧純鎹愮尞  5鍏跺畠")

--
Gitblit v1.9.3