From 12f980ced60db7aaa83f5fa3dc3eddfab0655c3e Mon Sep 17 00:00:00 2001 From: zc <zc@123> Date: 星期二, 16 九月 2025 09:54:21 +0800 Subject: [PATCH] 123 --- src/main/java/com/zy/asrs/controller/TVController.java | 2 +- src/main/resources/application.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/TVController.java b/src/main/java/com/zy/asrs/controller/TVController.java index 65dd4ce..6510d9e 100644 --- a/src/main/java/com/zy/asrs/controller/TVController.java +++ b/src/main/java/com/zy/asrs/controller/TVController.java @@ -384,7 +384,7 @@ list.add(map); } else if (shuttleProtocol.getMode() != 1) { map.put("deviceNo", shuttleProtocol.getShuttleNo());//璁惧鍙�-灏忚溅鍙� - map.put("errorMsg", shuttleProtocol.getMode$());//寮傚父淇℃伅 + map.put("errorMsg", shuttleProtocol.getMode$() + shuttleProtocol.getProtocolStatus$());//寮傚父淇℃伅 map.put("device", "鍥涘悜杞�");//寮傚父淇℃伅 list.add(map); } else if (shuttleProtocol.getProtocolStatusType() != ShuttleProtocolStatusType.IDLE) { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 7012a84..06116b0 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 9091 + port: 8080 servlet: context-path: /@pom.build.finalName@ -- Gitblit v1.9.1