From 214ebdf7db3f56fce7826abe0f286326246125f6 Mon Sep 17 00:00:00 2001
From: 艾金辉 <1144154118@qq.com>
Date: 星期五, 21 七月 2023 15:10:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/alarm/camera/mapper/ArdAlarmCameraMapper.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/alarm/cameraAlarm/mapper/ArdAlarmCameraMapper.java b/ard-work/src/main/java/com/ruoyi/alarm/camera/mapper/ArdAlarmCameraMapper.java
similarity index 91%
rename from ard-work/src/main/java/com/ruoyi/alarm/cameraAlarm/mapper/ArdAlarmCameraMapper.java
rename to ard-work/src/main/java/com/ruoyi/alarm/camera/mapper/ArdAlarmCameraMapper.java
index 88aaa06..c125bfa 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/cameraAlarm/mapper/ArdAlarmCameraMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/camera/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;
 
 

--
Gitblit v1.9.3