From d49863c81167ceb4b66c69c8be0e87319149c3b9 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 27 五月 2022 17:22:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java
index 04a2b09..383d07a 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java
@@ -191,8 +191,8 @@
map.put("lightemitName", bean.getLightemitName());
map.put("lightemitControlCode", bean.getLightemitControlCode());
map.put("isOnLine", bean.isOnLine());
- map.put("streetlightId", bean.getPoleId());
- map.put("streetlightName", bean.getPoleName());
+ map.put("streetlightId", bean.getStreetlightId());
+ map.put("streetlightName", bean.getStreetlightName());
mapList.add(map);
}
return ResponseUtil.success(mapList);
--
Gitblit v1.9.3