Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-09-07 ecf5a776601f9c30ae48f3ce0f0422ec6ffcb9f6

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

}