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

jinpengyong

2023-09-05 f3ddba24738e32305ea27eec3ca4c0e1253086d7

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

}