From ce7423ed32c2a427fe508909c41b9cd0dbfd2f58 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 20 一月 2025 15:18:26 +0800
Subject: [PATCH] Merge branch 'phyzasrs-erp' into phyzasrs-erp-4
---
src/main/webapp/static/image/logo2.png | 0
src/main/webapp/static/image/logo1.png | 0
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 1 +
3 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 8529651..cdbcfae 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -528,6 +528,7 @@
@Transactional
@ManagerAuth(memo = "璋冩嫧鍗曚换鍔′笅鍙�")
@Synchronized
+ @Deprecated //涓嶇敤浜�
public R agvLocMove(@RequestBody HashMap<String, Object> params) {
String fl = String.valueOf(params.get("floor"));
short floor = (short) Integer.parseInt(fl.substring(0, 1));
diff --git a/src/main/webapp/static/image/logo1.png b/src/main/webapp/static/image/logo1.png
index 71dd632..c7fcb86 100644
--- a/src/main/webapp/static/image/logo1.png
+++ b/src/main/webapp/static/image/logo1.png
Binary files differ
diff --git a/src/main/webapp/static/image/logo2.png b/src/main/webapp/static/image/logo2.png
new file mode 100644
index 0000000..71dd632
--- /dev/null
+++ b/src/main/webapp/static/image/logo2.png
Binary files differ
--
Gitblit v1.9.1