Merge remote-tracking branch 'origin/master'

aijinhui

2023-11-09 b5ae703a499b97fd83dd9a7b67a10a7b8157df5f

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

@@ -178,9 +178,9 @@
    </insert>

    <!--查询任务中相机已使用时段-->
    <select id="getTaskUsedCameraPeriods" parameterType="String" resultType="java.util.List">
    <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>