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/DonationCompletionBaseInfoDTO.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonationCompletionBaseInfoDTO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonationCompletionBaseInfoDTO.java
index 9e587cb..575c86b 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonationCompletionBaseInfoDTO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonationCompletionBaseInfoDTO.java
@@ -27,13 +27,22 @@
private Long id;
/**
+ * 鎵╁睍鍐呭
+ */
+ @ApiModelProperty("鎵╁睍鍐呭")
+ @Excel(name = "鎵╁睍鍐呭")
+ private String extracontent;
+
+ /**
* 璁板綍鐘舵��
*/
@ApiModelProperty("璁板綍鐘舵��")
@Excel(name = "璁板綍鐘舵��")
private String recordstate;
- /** 鎹愮尞绫诲埆 鏍规嵁瀛楀吀sys_DonationCategory */
+ /**
+ * 鎹愮尞绫诲埆 鏍规嵁瀛楀吀sys_DonationCategory
+ */
@ApiModelProperty("鎹愮尞绫诲埆")
@Excel(name = "鎹愮尞绫诲埆")
private String donationcategory;
@@ -199,4 +208,20 @@
@ApiModelProperty("鎹愮尞鍣ㄥ畼绉绘璇︽儏")
private List<ServiceDonatecomporgan> serviceDonatecomporganList;
+ /**
+ * 瀹屾垚鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純
+ */
+ @ApiModelProperty("瀹屾垚鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
+ @Excel(name = "瀹屾垚鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
+ private String completeState;
+
+ @ApiModelProperty("浜插睘鍏崇郴")
+ @Excel(name = "浜插睘鍏崇郴")
+ private String signfamilyrelations;
+
+ @ApiModelProperty("浜插睘濮撳悕")
+ @Excel(name = "浜插睘濮撳悕")
+ private String relationname;
+
+
}
--
Gitblit v1.9.3