Merge branch 'master' of http://xufenglei@blit.7drlb.com:8888/r/screen_api_...

xufenglei

2019-06-17 dbed3099ea0dd2a517b739f29943d4ee529760e6

 src/main/java/com/moral/service/MonitorPointService.java

@@ -37,4 +37,6 @@
   List<MonitorPoint> getMonitorPointsAndDevicesByRegion(Map<String, Object> parameters);



   Collection<Object> getDevicesStateByRegion(Map<String, Object> parameters);



   void isCompensateCalculation(Map<String, Object> parameters);

}