Merge remote-tracking branch 'origin/master'

aijinhui

2023-12-14 af3b68eeca07a30967754dc1a61b8def9efe188c

 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);
    /**
     * 批量删除报警过滤
     *