Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-02 57cb796b40a983afcff66edf967e2a1eb513b870

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

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



   public void deleteByIds(Integer... ids);

	
   List<MonitorPoint> getMonitorPointsByName(String name);



}