Merge remote-tracking branch 'origin/master'

aijinhui

2023-10-06 1f712d545d8cfd4e9dac74d22a67ebf599df1577

 ard-work/src/main/resources/mapper/alarm/ArdAlarmFilterMapper.xml

@@ -102,4 +102,11 @@
            #{id}
        </foreach>
    </delete>
    <update id="batchRecoveryArdAlarmFilterByIds" parameterType="String">
        update ard_alarm_filter set end_time=now()::timestamp(0)
        where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </update>
</mapper>