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/controller/ArdAlarmCameraController.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/alarm/cameraAlarm/controller/ArdAlarmCameraController.java b/ard-work/src/main/java/com/ruoyi/alarm/camera/controller/ArdAlarmCameraController.java
similarity index 95%
rename from ard-work/src/main/java/com/ruoyi/alarm/cameraAlarm/controller/ArdAlarmCameraController.java
rename to ard-work/src/main/java/com/ruoyi/alarm/camera/controller/ArdAlarmCameraController.java
index 5a52cd8..d02b1dc 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/cameraAlarm/controller/ArdAlarmCameraController.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/camera/controller/ArdAlarmCameraController.java
@@ -1,9 +1,9 @@
-package com.ruoyi.alarm.cameraAlarm.controller;
+package com.ruoyi.alarm.camera.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
-import com.ruoyi.alarm.cameraAlarm.domain.ArdAlarmCamera;
-import com.ruoyi.alarm.cameraAlarm.service.IArdAlarmCameraService;
+import com.ruoyi.alarm.camera.domain.ArdAlarmCamera;
+import com.ruoyi.alarm.camera.service.IArdAlarmCameraService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

--
Gitblit v1.9.3