Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-12 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41

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

@@ -38,4 +38,10 @@
   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);



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

}