Merge remote-tracking branch 'origin/master'

艾金辉

2023-07-21 214ebdf7db3f56fce7826abe0f286326246125f6

 ard-work/src/main/java/com/ruoyi/alarm/global/domain/GlobalAlarmCondition.java

文件名从 ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/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;