Merge remote-tracking branch 'origin/qa' into qa

cjl

2023-09-28 ff65dc92b93fe082e4e3b26cd949ebf6ece554e1

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

}