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

cjl

2023-09-12 87c10f8ad1cd11d126dabeea6071cdee617dbfa5

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

}