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

jinpengyong

2023-10-25 02a6c170797c5d2750ed07b21f22396a7683c54e

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

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

    void setRedisDevice();

}