From 87c7a14ff9309bcfcc3bff9d071a77a1f8d797de Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 26 三月 2024 15:33:11 +0800
Subject: [PATCH] Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/zy-asrs into phyzasrs
---
src/main/java/com/zy/asrs/controller/MobileController.java | 9 ++++++++-
1 files changed, 8 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 9796c20..08b1789 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -338,7 +338,7 @@
骞冲簱 搴撲綅鎺ㄨ崘
*/
@RequestMapping("/node/recommend/loc")
- @ManagerAuth(memo = "搴撲綅鎺ㄨ崘")
+ //@ManagerAuth(memo = "搴撲綅鎺ㄨ崘")
public R recommendNodeLoc(@RequestBody HashMap<String,String> param){
String zpallet = param.get("zpallet");
@@ -482,6 +482,13 @@
}
+ //骞冲簱涓婃灦(鏃犵粍鎵樹笂鏋�)
+ @RequestMapping("/node/pakin/v1")
+ public R nodePakinNoComb(@RequestBody CombParam param){
+ mobileService.nodePakinNoComb(param);
+ return R.ok();
+ }
+
private String findNodeLoc(List<LocRule> locRules){
for (LocRule locRule : locRules) {
if (Cools.isEmpty(locRule.getOther())) {
--
Gitblit v1.9.1