Merge branch 'wb' into qa

cjl

2023-09-27 f0a5a28345ed6764ac033a585f1e6b7cbcf8d102

 screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java

@@ -32,4 +32,6 @@

    List<Integer> deviceOrgIdList(@Param("organizationId") int organizationId);

    List<String> deviceMacs(@Param("organizationId") int organizationId);

}