Merge remote-tracking branch 'origin/master'

艾金辉

2023-07-21 214ebdf7db3f56fce7826abe0f286326246125f6

 ard-work/src/main/java/com/ruoyi/alarm/steal/mapper/ArdAlarmStealelecMapper.java

文件名从 ard-work/src/main/java/com/ruoyi/alarm/stealAlarm/mapper/ArdAlarmStealelecMapper.java 修改
@@ -1,11 +1,8 @@
package com.ruoyi.alarm.stealAlarm.mapper;
package com.ruoyi.alarm.steal.mapper;

import com.ruoyi.alarm.globalAlarm.domain.GlobalAlarmCondition;
import com.ruoyi.alarm.stealAlarm.domain.ArdAlarmStealelec;
import com.ruoyi.alarm.tubeAlarm.domain.ArdAlarmTube;
import com.ruoyi.alarm.global.domain.GlobalAlarmCondition;
import com.ruoyi.alarm.steal.domain.ArdAlarmStealelec;
import org.apache.ibatis.annotations.Param;

import java.util.Date;
import java.util.List;