Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-17 9e248232763446e3b0d2b0541ee55e61a9df74b8

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

@@ -19,4 +19,11 @@
    public void addOrModify(MonitorPoint monitorPoint);



   public void deleteByIds(Integer... ids);

	
   List<MonitorPoint> getMonitorPointsByName(String name);

    List<Map<String,String>> queryMonitroPointsState(List<Integer> idList);



   List<MonitorPoint> getMonitorPointsByOrganizationId(Integer orgId);



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

}