From 30ba88092221aa34c9a344e5c9c3891a7ed50daa Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期一, 20 四月 2026 22:03:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lggslasrs' into lggslasrs

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

diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 1fc5c4d..cbef314 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -49,7 +49,7 @@
     }
 
     @RequestMapping("/test/station/storage/crn/list")
-    @ManagerAuth(memo = "娴嬭瘯绔欑偣搴撳尯鍫嗗灈鏈洪『搴�")
+    @ManagerAuth(memo = "娴嬭瘯绔欑偣鍏ュ簱浼樺厛鍫嗗灈鏈洪『搴�")
     public R testStationStorageCrnList(@RequestParam Integer stationId,
                                        @RequestParam(required = false) Integer locType1,
                                        @RequestParam(required = false) String matnr) {

--
Gitblit v1.9.1