From e2bbbae80c232e386d7f06daab2a1daf2229bbc1 Mon Sep 17 00:00:00 2001
From: yy <yy123>
Date: 星期二, 30 十二月 2025 13:14:07 +0800
Subject: [PATCH] Merge branch 'whxr' of http://47.97.1.152:5880/r/rcs-flow into whxr
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java
index 3defd6e..6947650 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java
@@ -92,7 +92,7 @@
if (null != agvDetail) {
agv.setAgvDetail(agvDetail);
}
- AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
+ AgvModel agvModel = agvModelService.getByAgvId(agv.getId());
if (null != agvModel) {
agv.setAgvModelData(agvModel);
}
--
Gitblit v1.9.1