Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-03 b97887d232f865b6a4bf835861aac8a4ebc55c28

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

@@ -40,4 +40,6 @@
   List<Map<String,String>> queryDevicesState(List<String> macList,Boolean withData);



   Device queryById(Integer id);



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

}