From 9e248232763446e3b0d2b0541ee55e61a9df74b8 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 17 May 2018 17:21:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/webapp/view/map.jsp |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/webapp/view/map.jsp b/src/main/webapp/view/map.jsp
index 21e667a..e339ca1 100644
--- a/src/main/webapp/view/map.jsp
+++ b/src/main/webapp/view/map.jsp
@@ -365,6 +365,7 @@
 										mac: (_obj['mac']).toLowerCase(),
 										longitude: _obj['longitude'],
 										latitude: _obj['latitude'],
+                                        monitorPointId: _obj['monitorPointId'],
 									    version:_obj['deviceVersion']['version']
 									}
 									var equStr = JSON.stringify(equ);

--
Gitblit v1.8.0