Merge remote-tracking branch 'origin/master'

aijinhui

2023-10-06 1f712d545d8cfd4e9dac74d22a67ebf599df1577

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

@@ -2,9 +2,7 @@

import java.util.List;

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

/**