Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-17 9e248232763446e3b0d2b0541ee55e61a9df74b8

 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);