Merge remote-tracking branch 'origin/master'

aijinhui

2023-10-24 8a87e4226aa802d6a0e3566c66824fedf68e77da

 ard-work/src/main/java/com/ruoyi/alarm/filter/service/IArdAlarmFilterService.java

@@ -42,7 +42,13 @@
     * @return 结果
     */
    public int updateArdAlarmFilter(ArdAlarmFilter ardAlarmFilter);

    /**
     * 批量恢复报警过滤
     *
     * @param ids 需要恢复的报警过滤主键集合
     * @return 结果
     */
    public int RecoveryArdAlarmFilter(String[] ids);
    /**
     * 批量删除报警过滤
     *