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/IGlobalAlarmService.java | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/IGlobalAlarmService.java b/ard-work/src/main/java/com/ruoyi/alarm/global/service/IGlobalAlarmService.java similarity index 76% rename from ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/IGlobalAlarmService.java rename to ard-work/src/main/java/com/ruoyi/alarm/global/service/IGlobalAlarmService.java index c74748d..ecdb659 100644 --- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/IGlobalAlarmService.java +++ b/ard-work/src/main/java/com/ruoyi/alarm/global/service/IGlobalAlarmService.java @@ -1,9 +1,8 @@ -package com.ruoyi.alarm.globalAlarm.service; +package com.ruoyi.alarm.global.service; -import com.ruoyi.alarm.globalAlarm.domain.GlobalAlarmCondition; -import com.ruoyi.alarm.globalAlarm.domain.GlobalAlarmData; +import com.ruoyi.alarm.global.domain.GlobalAlarmCondition; +import com.ruoyi.alarm.global.domain.GlobalAlarmData; -import java.util.Date; import java.util.List; import java.util.Map; -- Gitblit v1.9.3