From 09afe52c3ef2a09055fb621b25aa5416394a5382 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 14 十月 2022 16:59:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java | 1 +
1 files changed, 1 insertions(+), 0 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 f5c0538..dfe475c 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
@@ -134,6 +134,7 @@
map.put("poleId", bean.getPoleId());
map.put("poleName", bean.getPoleName());
map.put("onlineStatus", bean.getOnlineStatus());
+ map.put("resolution", bean.getWidth() + " * " + bean.getHeight());
mapList.add(map);
}
return ResponseUtil.success(mapList);
--
Gitblit v1.9.3