Merge remote-tracking branch 'origin/master'

aijinhui

2023-10-07 8c8af4faa4303499fe9e81dd117932e246008eb0

 ard-work/src/main/java/com/ruoyi/alarm/radar/mapper/ArdAlarmRadarPumpMapper.java

@@ -2,8 +2,6 @@

import java.util.List;

import com.ruoyi.alarm.radar.domain.ArdAlarmRadar;
import com.ruoyi.alarm.radar.domain.ArdAlarmRadarFire;
import com.ruoyi.alarm.radar.domain.ArdAlarmRadarPump;
import org.apache.ibatis.annotations.Param;