Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-07 46670e34c1105649da6091a0829b9451c9fe5b37

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

}