Merge remote-tracking branch 'origin/master'

Administrator

2023-07-28 c45ce58884c59ddf8a6051ba370215e6f62adeb8

 ruoyi-system/src/main/java/com/ruoyi/alarm/config/mapper/ArdAlarmTypeConfigMapper.java

File was renamed from ard-work/src/main/java/com/ruoyi/alarm/config/mapper/ArdAlarmTypeConfigMapper.java
@@ -1,7 +1,9 @@
package com.ruoyi.alarm.config.mapper;

import java.util.List;
import com.ruoyi.alarm.config.domain.ArdAlarmTypeConfig;
import com.ruoyi.system.domain.SysUserRole;

import java.util.List;

/**
 * 报警类型用户关联Mapper接口
@@ -64,6 +66,14 @@
     * @param userId 关联的用户id
     * @return 结果
     */
    public int deleteArdAlarmTypeConfigByCurrentUserId(String userId);
    public int deleteArdAlarmTypeConfigByUserId(String userId);

    /**
     * 批量新增报警类型用户关联
     *
     * @param ardAlarmTypeConfigList 报警类型用户列表
     * @return 结果
     */
    public int batchAlarmTypeConfig(List<ArdAlarmTypeConfig> ardAlarmTypeConfigList);

}