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/domain/GlobalAlarmCondition.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/domain/GlobalAlarmCondition.java b/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GlobalAlarmCondition.java
similarity index 93%
rename from ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/domain/GlobalAlarmCondition.java
rename to ard-work/src/main/java/com/ruoyi/alarm/global/domain/GlobalAlarmCondition.java
index 5b00458..7747840 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/domain/GlobalAlarmCondition.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GlobalAlarmCondition.java
@@ -1,4 +1,4 @@
-package com.ruoyi.alarm.globalAlarm.domain;
+package com.ruoyi.alarm.global.domain;
 
 import com.ruoyi.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;

--
Gitblit v1.9.3