From 04c0428cae83c9e59bbb174592f8b48eb97398c1 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期一, 12 十二月 2022 08:18:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hylywcs' into hylywcs
---
src/main/java/com/zy/asrs/controller/SiteController.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index bbcb229..fffc591 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -49,6 +49,12 @@
map2.put("modeVal", devpThread.ioModeOf2F.id);
map2.put("modeDesc", devpThread.ioModeOf2F.desc);
res.add(map2);
+
+ Map<String, Object> map4 = new HashMap<>();
+ map4.put("floor", 4);
+ map4.put("modeVal", devpThread.ioModeOf4F.id);
+ map4.put("modeDesc", devpThread.ioModeOf4F.desc);
+ res.add(map4);
}
return R.ok().add(res);
}
--
Gitblit v1.9.1