Merge remote-tracking branch 'origin/master'

kaiyu

2020-12-15 3a46aae0a8e9e4bd3cb8dcd1185a69a74668995b

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

@@ -90,4 +90,7 @@
   List<Device> getDevice(String macOrName);



   List<Device> getDeviceByCode();



   List<Device> getDevicesByAccountId(String id);



}