Merge remote-tracking branch 'origin/dev' into dev_

jinpengyong

2022-03-09 5fa4c1db3141099be4ca176cdf2f3ec10f46c141

 screen-api/src/main/java/com/moral/api/service/DeviceService.java

@@ -31,4 +31,10 @@
    //获取当前组织下所有设备列表
    List<Map<String, Object>> getDevicesByOrganizationId(Integer orgId);

    //获取当前组织下设备mac集合
    List<String> getMacsByOrganizationId(Integer organizationId);

    //获取当前组织,当前乡镇区域下设备mac集合
    List getMacsByOrgIdAndRegionCode(Integer organizationId,Integer regionCode);

}