From 9b138d5216ad21a69d0dfde310ccc81e53fb627e Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 09 四月 2024 15:38:31 +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 | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 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 d626d1f..015f398 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,7 +2,9 @@
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;
import com.doumee.dao.business.model.UnionChange;
import java.util.List;
@@ -106,17 +108,17 @@
/**
* 鍏抽棴 鍚堝苟鍗曪紙鍔犲噺淇�/鎹㈠巶鍗曪級
- * @param id
+ * @param closeDTO
*/
- void cancelMerge(Integer id);
+ void cancelMerge(CloseDTO closeDTO);
/**
* 鍚堝苟鍗曪紙鍔犲噺淇�/鎹㈠巶锛� - 鎶曚繚鐢宠绛剧讲
- * @param id
+ * @param smsCheckDTO
* @return
*/
- String getSignLink(Integer id);
+ String getSignLink(SmsCheckDTO smsCheckDTO);
/**
@@ -125,5 +127,17 @@
*/
void uploadBXD(UnionChangeBXDDTO unionChangeBXDDTO);
+ /**
+ * 鏌ヨ璇︽儏
+ * @param id
+ * @return
+ */
+ UnionChange getDetail(Integer id);
+ /**
+ * 鏌ョ湅璇﹀崟 瀵煎嚭
+ * @param unionChangeId
+ * @return
+ */
+ UnionChange unionChangeDetail(Integer unionChangeId);
}
--
Gitblit v1.9.3