From bd57081dc1bcd94e1e4043a9e0a7c6953d4bb9d4 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 01 四月 2024 19:19:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/dao/business/dto/ApplyDetailPageDTO.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 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 b51654a..93dabf6 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
@@ -16,6 +16,7 @@
@ApiModelProperty(value = "鍦ㄤ繚鐘舵�侊細1=淇濋殰涓紱2=涓嶅湪淇濓紱 0=鍏ㄩ儴")
private Integer applyStatus;
+
@ApiModelProperty(value = "娲鹃仯鍗曚綅涓婚敭")
private Integer duId;
@@ -24,6 +25,10 @@
@ApiModelProperty(value = "鍛樺伐濮撳悕")
private String memberName;
+
+ @ApiModelProperty(value = "鍛樺伐涓婚敭")
+ private Integer memberId;
+
@ApiModelProperty(value = "鍛樺伐濮撳悕",hidden = true)
private String companyName;
@ApiModelProperty(value = "鏂规鍚嶇О",hidden = true)
@@ -43,6 +48,10 @@
@ApiModelProperty(value = "淇濆崟涓婚敭")
private Integer applyId;
+ @ApiModelProperty(value = "鍔犲噺淇濅富閿�")
+ private Integer applyChangeId;
+ @ApiModelProperty(value = "鍚堝苟鍗曚富閿�")
+ private Integer unionApplyId;
@ApiModelProperty(value = "绫诲瀷锛�0=鍔犱繚锛�1=鍑忎繚锛�2=鎹㈠巶 ")
private List<Integer> types;
--
Gitblit v1.9.3