Merge remote-tracking branch 'origin/master'

艾金辉

2023-07-21 214ebdf7db3f56fce7826abe0f286326246125f6

 ard-work/src/main/java/com/ruoyi/alarm/camera/mapper/ArdAlarmCameraMapper.java

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

import java.util.List;
import com.ruoyi.alarm.cameraAlarm.domain.ArdAlarmCamera;
import com.ruoyi.alarm.tubeAlarm.domain.ArdAlarmTube;
import com.ruoyi.alarm.camera.domain.ArdAlarmCamera;
import org.apache.ibatis.annotations.Param;