Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

kaiyu

2020-12-01 65007f6811e580d8660340b8216296e68fae598c

 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();

}