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/service/business/UnionChangeService.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/UnionChangeService.java b/server/service/src/main/java/com/doumee/service/business/UnionChangeService.java
index ed1c9e3..8cb039d 100644
--- a/server/service/src/main/java/com/doumee/service/business/UnionChangeService.java
+++ b/server/service/src/main/java/com/doumee/service/business/UnionChangeService.java
@@ -2,6 +2,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.dto.CloseDTO;
import com.doumee.dao.business.dto.SaveUnionChangeDTO;
import com.doumee.dao.business.dto.SmsCheckDTO;
import com.doumee.dao.business.dto.UnionChangeBXDDTO;
@@ -107,9 +108,9 @@
/**
* 鍏抽棴 鍚堝苟鍗曪紙鍔犲噺淇�/鎹㈠巶鍗曪級
- * @param id
+ * @param closeDTO
*/
- void cancelMerge(Integer id);
+ void cancelMerge(CloseDTO closeDTO);
/**
--
Gitblit v1.9.3