From 010dc23827d3b1020356b6741ec47f7ce81497ab Mon Sep 17 00:00:00 2001 From: whycq <123456> Date: 星期五, 05 七月 2024 13:05:32 +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