From e596214d84efa77d0cf316563548f1b1d7643a37 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 24 十一月 2025 08:40:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

---
 src/main/java/com/zy/asrs/controller/MobileController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 527fb24..fffe287 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -211,7 +211,7 @@
 //    @ManagerAuth(memo = "缁勬墭")
     public R combAutoWcs(@RequestBody CombParam combParam){
 //        mobileService.comb(combParam, getUserId());
-        mobileService.comb(combParam, 7777L);
+        mobileService.combAuto(combParam, 7777L);
         return R.ok("缁勬墭鎴愬姛");
     }
 

--
Gitblit v1.9.1