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/global/service/impl/QueueTaskExecutor.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueTaskExecutor.java b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueTaskExecutor.java
similarity index 86%
rename from ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueTaskExecutor.java
rename to ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueTaskExecutor.java
index 48469a8..e3f965c 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueTaskExecutor.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueTaskExecutor.java
@@ -1,14 +1,14 @@
-package com.ruoyi.alarm.globalAlarm.service.impl;
+package com.ruoyi.alarm.global.service.impl;
 
-import com.ruoyi.alarm.accessAlarm.domain.ArdAlarmAccess;
-import com.ruoyi.alarm.accessAlarm.service.IArdAlarmAccessService;
-import com.ruoyi.alarm.externalAlarm.domain.ArdAlarmExternal;
-import com.ruoyi.alarm.externalAlarm.service.IArdAlarmExternalService;
-import com.ruoyi.alarm.globalAlarm.domain.GuideTask;
-import com.ruoyi.alarm.radarAlarm.domain.ArdAlarmRadar;
-import com.ruoyi.alarm.radarAlarm.service.IArdAlarmRadarService;
-import com.ruoyi.alarm.tubeAlarm.domain.ArdAlarmTube;
-import com.ruoyi.alarm.tubeAlarm.service.IArdAlarmTubeService;
+import com.ruoyi.alarm.access.domain.ArdAlarmAccess;
+import com.ruoyi.alarm.access.service.IArdAlarmAccessService;
+import com.ruoyi.alarm.external.domain.ArdAlarmExternal;
+import com.ruoyi.alarm.external.service.IArdAlarmExternalService;
+import com.ruoyi.alarm.global.domain.GuideTask;
+import com.ruoyi.alarm.radar.domain.ArdAlarmRadar;
+import com.ruoyi.alarm.radar.service.IArdAlarmRadarService;
+import com.ruoyi.alarm.tube.domain.ArdAlarmTube;
+import com.ruoyi.alarm.tube.service.IArdAlarmTubeService;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.device.camera.domain.CameraCmd;
 import com.ruoyi.device.hiksdk.service.IHikClientService;

--
Gitblit v1.9.3