Merge remote-tracking branch 'origin/master'

lizijie

2020-11-05 ff4135a758efe532ee5566fbdb6d9fee9e8410f8

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

@@ -18,4 +18,6 @@
    List<String> getMacByOrganizationid(List<Object> organizationIdList);



    List<Map<String, Object>> macAndOrganizationIdMap(List<String> macs);



    List<Map<String, Object>> getAllByMacList(List<String> macList);

}