From 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 十二月 2024 14:37:54 +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 | 8 +++++++-
1 files changed, 7 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 93dabf6..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,7 +13,7 @@
@Data
public class ApplyDetailPageDTO {
- @ApiModelProperty(value = "鍦ㄤ繚鐘舵�侊細1=淇濋殰涓紱2=涓嶅湪淇濓紱 0=鍏ㄩ儴")
+ @ApiModelProperty(value = "鍦ㄤ繚鐘舵�侊細1=淇濋殰涓紱2=涓嶅湪淇濓紱3=寰呯敓鏁� 0=鍏ㄩ儴")
private Integer applyStatus;
@@ -46,12 +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