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

kaiyu

2020-11-24 1d7e1b771160dd8b7f25765e402ce25cac676641

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

@@ -86,4 +86,8 @@
   List<Device> getDeviceByCodeAndId(String code,String id);



   String byMacGetOrgId(String mac);

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

   List<Device> getDevice(String macOrName);



   List<Device> getDeviceByCode();

}