From f000aa1fea823c92a343a5f3f3e8bc385d06fd34 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 24 三月 2023 17:13:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index c7534f6..7c5b684 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -58,7 +58,7 @@
res.add(map2);
} else {
Map<String, Object> map3 = new HashMap<>();
- map3.put("floor", 2);
+ map3.put("floor", 3);
map3.put("modeVal", devpThread.ioModeOf1F3.id);
map3.put("modeDesc", devpThread.ioModeOf1F3.desc);
res.add(map3);
@@ -126,8 +126,8 @@
vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 鍏ュ簱鏍囪
vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
-// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
- vo.setLocType1(devp.getDevNo()==102 ? "楂�" : "浣�");
+ vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "灏�" : "澶�"); //楂樹綆搴撲綅
+// vo.setLocType1(devp.getDevNo()==102 ? "楂�" : "浣�");
}
return R.ok().add(list);
}
--
Gitblit v1.9.1