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

jinpengyong

2023-09-28 bec26ab287b22ed9ba6eaa4da64d91a374fdc14d

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

}