Merge remote-tracking branch 'origin/master'

Administrator

2023-08-21 516e341ee555f64d081b85f20d102f4c47f061a5

 ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml

@@ -180,7 +180,7 @@
    <!--查询任务中相机已使用时段-->
    <select id="getTaskUsedCameraPeriods" parameterType="String" resultType="java.util.HashMap">
        select t.start_time,t.end_time from ard_video_inspect_task t
        where t.camera_id=#{startMonth}
        where t.camera_id=#{cameraId}
        ORDER BY t.start_time
    </select>
</mapper>