Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

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

@@ -88,4 +88,6 @@
   String byMacGetOrgId(String mac);

   //通过mac号或者设备名进行查询设备

   List<Device> getDevice(String macOrName);



   List<Device> getDeviceByCode();

}