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

diff --git a/ard-work/src/main/java/com/ruoyi/alarm/externalAlarm/controller/ArdAlarmExternalController.java b/ard-work/src/main/java/com/ruoyi/alarm/external/controller/ArdAlarmExternalController.java
similarity index 94%
rename from ard-work/src/main/java/com/ruoyi/alarm/externalAlarm/controller/ArdAlarmExternalController.java
rename to ard-work/src/main/java/com/ruoyi/alarm/external/controller/ArdAlarmExternalController.java
index fff6139..7b20dc1 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/externalAlarm/controller/ArdAlarmExternalController.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/external/controller/ArdAlarmExternalController.java
@@ -1,10 +1,10 @@
-package com.ruoyi.alarm.externalAlarm.controller;
+package com.ruoyi.alarm.external.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ruoyi.alarm.externalAlarm.domain.ArdAlarmExternal;
-import com.ruoyi.alarm.externalAlarm.service.IArdAlarmExternalService;
+import com.ruoyi.alarm.external.domain.ArdAlarmExternal;
+import com.ruoyi.alarm.external.service.IArdAlarmExternalService;
 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