Merge remote-tracking branch 'origin/master'

fengxiang

2018-01-26 e125b445697a6b8c2b5cc5c57f31249c5088c1c9

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

@@ -22,4 +22,6 @@
   void deleteByIds(Integer[] ids);



    void addOrModify(Device device);



   List<Device> getDevicesByMonitorPointId(Integer monitorPointId);

}