Merge remote-tracking branch 'origin/master'

Administrator

2023-08-21 516e341ee555f64d081b85f20d102f4c47f061a5

 ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java

@@ -137,7 +137,7 @@
            Map option = new HashMap();
            option.put("value", item.getId());
            option.put("label", item.getName());
            option.put("channel", item.getChannel());
            option.put("channel", item.getChanNo());
            List timeList = ardVideoInspectTaskService.getCameraIdleTimeList(item.getId());
            option.put("idleTimeList", timeList);//空闲时间段
            options.add(option);