Merge remote-tracking branch 'origin/cjl' into dev

cjl

2023-11-08 5c1d58556e9cd4c7603b5e16dc1640f61623af0b

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

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

    void setRedisDevice();

}