From e1c7f150792a5085dd64e86e6af82820ab34dc05 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 03 九月 2024 08:06:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-2' into tzskasrs-2
---
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