From e567a81f9dd15c15981c25576cc83df6331ea2b5 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 20 五月 2025 11:19:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/dao/business/dto/ApplyDetailPageDTO.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/dto/ApplyDetailPageDTO.java b/server/service/src/main/java/com/doumee/dao/business/dto/ApplyDetailPageDTO.java
index 5329ebc..c6a1f02 100644
--- a/server/service/src/main/java/com/doumee/dao/business/dto/ApplyDetailPageDTO.java
+++ b/server/service/src/main/java/com/doumee/dao/business/dto/ApplyDetailPageDTO.java
@@ -13,8 +13,9 @@
@Data
public class ApplyDetailPageDTO {
- @ApiModelProperty(value = "鍦ㄤ繚鐘舵�侊細1=淇濋殰涓紱2=涓嶅湪淇濓紱 0=鍏ㄩ儴")
+ @ApiModelProperty(value = "鍦ㄤ繚鐘舵�侊細1=淇濋殰涓紱2=涓嶅湪淇濓紱3=寰呯敓鏁� 0=鍏ㄩ儴")
private Integer applyStatus;
+
@ApiModelProperty(value = "娲鹃仯鍗曚綅涓婚敭")
private Integer duId;
@@ -24,6 +25,14 @@
@ApiModelProperty(value = "鍛樺伐濮撳悕")
private String memberName;
+
+ @ApiModelProperty(value = "鍛樺伐涓婚敭")
+ private Integer memberId;
+
+ @ApiModelProperty(value = "鍛樺伐濮撳悕",hidden = true)
+ private String companyName;
+ @ApiModelProperty(value = "鏂规鍚嶇О",hidden = true)
+ private String solutionName;
@ApiModelProperty(value = "鐢熸晥璧锋湡 yyyy-MM-dd 寮�濮�")
private String startTimeS;
@@ -37,8 +46,18 @@
@ApiModelProperty(value = "鐢熸晥姝㈡湡 yyyy-MM-dd 缁撴潫")
private String endTimeE;
+
+ @ApiModelProperty(value = "鏄惁鏄鍑猴紱0=鍚︼紱1=鏄�",hidden = true)
+ private Integer isExcel;
+
@ApiModelProperty(value = "淇濆崟涓婚敭")
private Integer applyId;
+ @ApiModelProperty(value = "鍔犲噺淇濅富閿�")
+ private Integer applyChangeId;
+ @ApiModelProperty(value = "鍚堝苟鍗曚富閿�")
+ private Integer unionApplyId;
+ @ApiModelProperty(value = "鍚堝苟鍗曚富閿�")
+ private Integer unionChangeId;
@ApiModelProperty(value = "绫诲瀷锛�0=鍔犱繚锛�1=鍑忎繚锛�2=鎹㈠巶 ")
private List<Integer> types;
--
Gitblit v1.9.3