Merge remote-tracking branch 'origin/master'

fengxiang

2018-06-01 239a521e95f6d7fcf8cbf18b71c09140e5d0f55f

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

@@ -26,4 +26,6 @@
   List<MonitorPoint> getMonitorPointsByOrganizationId(Integer orgId);



   List<MonitorPoint> getMonitorPointsByRegion(Map<String, Object> parameters);



    List<Integer> queryVersionsById(Integer id);

}