From bb32acfe7b46f4353007233755dd417fce7f952e Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 12 三月 2024 11:57:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java b/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java
index ac38edf..f52f696 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java
@@ -72,7 +72,8 @@
     @ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥璧锋湡")
     @ExcelColumn(name="淇濋櫓鐢熸晥璧锋湡",index =8,width = 12,dateFormat="yyyy-MM-dd HH:mm:ss")
     private Date startTime;
-
+    @ApiModelProperty(value = "鍚堝苟鍗曠紪鐮侊紙鍏宠仈union_apply)", example = "1")
+    private Integer unionApplyId;
     @ApiModelProperty(value = "韬唤璇佸彿鐮�")
     @ExcelColumn(name="韬唤璇佸彿鐮�",index = 5,width = 12)
     private String idcardNo;

--
Gitblit v1.9.3