From 5e966ab720ffff2bd0fe55ffda7263606923732d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 02 二月 2023 10:58:03 +0800
Subject: [PATCH] Merge branch 'bfasrs' of http://47.97.1.152:5880/r/zy-asrs into bfasrs
---
src/main/java/com/zy/asrs/controller/MobileController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index b4e9b00..4acc3f0 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -364,10 +364,15 @@
@RequestMapping("/adjustNew/auth")
@ManagerAuth(memo = "鐩樼偣")
- public R adjustNew(@RequestBody MobileAdjustParam combParam){
- mobileService.adjustNew(combParam, getUserId());
+ public synchronized R adjustNew(@RequestBody MobileAdjustParam combParam){
+ mobileService.adjustNew(combParam, Boolean.FALSE, getUserId());
return R.ok("鐩樼偣鎴愬姛");
}
-
+ @RequestMapping("/adjustNew/v2/auth")
+ @ManagerAuth(memo = "琛ヨ揣")
+ public synchronized R adjustNewV2(@RequestBody MobileAdjustParam combParam){
+ mobileService.adjustNew(combParam, Boolean.TRUE, getUserId());
+ return R.ok("琛ヨ揣鎴愬姛");
+ }
}
--
Gitblit v1.9.1