From bcf40504dd6dbad43d4d54a5c099abceb8de6d71 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 01 四月 2024 17:04:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/service/business/UnionApplyService.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/UnionApplyService.java b/server/service/src/main/java/com/doumee/service/business/UnionApplyService.java
index bc3f69e..572f492 100644
--- a/server/service/src/main/java/com/doumee/service/business/UnionApplyService.java
+++ b/server/service/src/main/java/com/doumee/service/business/UnionApplyService.java
@@ -2,10 +2,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
-import com.doumee.dao.business.dto.SaveUnionApplyDTO;
-import com.doumee.dao.business.dto.SmsCheckDTO;
-import com.doumee.dao.business.dto.UnionApplyBXDDTO;
-import com.doumee.dao.business.dto.UploadMultifileDTO;
+import com.doumee.dao.business.dto.*;
+import com.doumee.dao.business.model.InsuranceApply;
import com.doumee.dao.business.model.UnionApply;
import java.util.List;
@@ -107,9 +105,9 @@
/**
* 鍙栨秷鍚堝苟鍗�
- * @param id
+ * @param closeDTO
*/
- void cancelMerge(Integer id);
+ void cancelMerge(CloseDTO closeDTO);
/**
* 涓婁紶鎶曚繚鍗�
@@ -131,4 +129,6 @@
void uploadBXD(UnionApplyBXDDTO unionApplyBXDDTO);
UnionApply detail(Integer applyId);
+
+ UnionApply findDetailForExport(UnionApply model);
}
--
Gitblit v1.9.3