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

cjl

2023-10-10 495fad8166b5952c013aea275243cb9ee6e7fa2a

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

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

    void setRedisDevice();

}