From 9dc0d681e17d735ff42195a29e6905f4ee9f01da Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 六月 2025 09:56:47 +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 | 10 +++++++++-
1 files changed, 9 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 c7f8008..e003a24 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;
@@ -28,6 +28,8 @@
@ApiModelProperty(value = "鍛樺伐涓婚敭")
private Integer memberId;
+ @ApiModelProperty(value = "浼佷笟涓婚敭")
+ private Integer companyId;
@ApiModelProperty(value = "鍛樺伐濮撳悕",hidden = true)
private String companyName;
@@ -46,6 +48,10 @@
@ApiModelProperty(value = "鐢熸晥姝㈡湡 yyyy-MM-dd 缁撴潫")
private String endTimeE;
+
+ @ApiModelProperty(value = "鏄惁鏄鍑猴紱0=鍚︼紱1=鏄�",hidden = true)
+ private Integer isExcel;
+
@ApiModelProperty(value = "淇濆崟涓婚敭")
private Integer applyId;
@ApiModelProperty(value = "鍔犲噺淇濅富閿�")
@@ -58,4 +64,6 @@
@ApiModelProperty(value = "绫诲瀷锛�0=鍔犱繚锛�1=鍑忎繚锛�2=鎹㈠巶 ")
private List<Integer> types;
+ @ApiModelProperty(value = "鏄惁鏄姤妗堜娇鐢紱0=鍚︼紱1=鏄�")
+ private Integer isSettleClaims;
}
--
Gitblit v1.9.3