Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-10 ef431a71ed043e8fb63777793df23c110b853803

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

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



   List<MonitorPoint> getMonitorPointsByOrganizationId(Integer orgId);



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

}