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 |    4 +++-
 1 files changed, 3 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 d102de0..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
@@ -49,7 +49,9 @@
     @ApiModelProperty(value = "淇濆崟涓婚敭")
     private Integer applyId;
     @ApiModelProperty(value = "鍔犲噺淇濅富閿�")
-    private Integer applyChangId;
+    private Integer applyChangeId;
+    @ApiModelProperty(value = "鍚堝苟鍗曚富閿�")
+    private Integer unionApplyId;
 
     @ApiModelProperty(value = "绫诲瀷锛�0=鍔犱繚锛�1=鍑忎繚锛�2=鎹㈠巶 ")
     private List<Integer> types;

--
Gitblit v1.9.3