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

cjl

2023-09-28 bcc3e41bdd1865c288f7d570ce4da1d5cea32462

 screen-manage/src/main/java/com/moral/api/service/DeviceService.java

@@ -73,4 +73,6 @@
     **/
    List<Map<String,Object>> selectMonitorPiontAndDeviceByOrgId(int orgId);

    void setRedisDevice();

}