Merge remote-tracking branch 'origin/master'

艾金辉

2023-07-21 214ebdf7db3f56fce7826abe0f286326246125f6

 ard-work/src/main/java/com/ruoyi/alarm/external/mapper/ArdAlarmExternalMapper.java

文件名从 ard-work/src/main/java/com/ruoyi/alarm/externalAlarm/mapper/ArdAlarmExternalMapper.java 修改
@@ -1,8 +1,7 @@
package com.ruoyi.alarm.externalAlarm.mapper;
package com.ruoyi.alarm.external.mapper;

import java.util.List;
import com.ruoyi.alarm.externalAlarm.domain.ArdAlarmExternal;
import com.ruoyi.alarm.radarAlarm.domain.ArdAlarmRadar;
import com.ruoyi.alarm.external.domain.ArdAlarmExternal;
import org.apache.ibatis.annotations.Param;

/**