From 2fa5571c76fa3a9f115a7e7598b297879a437228 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期二, 13 八月 2024 18:33:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phpsasrs' into phpsasrs
---
src/main/java/com/zy/asrs/service/MobileService.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index 06ab3c4..874d852 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -25,6 +25,11 @@
void comb2(CombParam param, Long userId);
/**
+ * 缁勬墭
+ */
+ void mergeComb(CombParam param, Long userId);
+
+ /**
* 鏍￠獙bom
*/
R checkBom(CheckBom param, Long userId);
--
Gitblit v1.9.1