Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-06 f4ed03e33cd777996c697894c4075128546c3a74

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

@@ -21,5 +21,5 @@
   public void deleteByIds(Integer... ids);

   

   List<MonitorPoint> getMonitorPointsByName(String name);



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

}