Merge remote-tracking branch 'origin/master'

fengxiang

2018-06-01 239a521e95f6d7fcf8cbf18b71c09140e5d0f55f

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

@@ -38,4 +38,8 @@
   List<Device> getDevicesByMonitorPointId(Integer monitorPointId);



   List<Map<String,String>> queryDevicesState(List<String> macList,Boolean withData);



   Device queryById(Integer id);



   List<Device> getDevicesByProfessionId(Map<String, Object> parameters);

}