Merge remote-tracking branch 'origin/master'

fengxiang

2018-06-22 0fd34e51dadbf9598188b0e061b658139e6d6257

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

@@ -24,4 +24,8 @@
    List<Map<String,String>> queryMonitroPointsState(List<Integer> idList);



   List<MonitorPoint> getMonitorPointsByOrganizationId(Integer orgId);



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



    List<Integer> queryVersionsById(Integer id);

}