From 1f712d545d8cfd4e9dac74d22a67ebf599df1577 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 06 十月 2023 11:24:56 +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, 2 insertions(+), 0 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GlobalAlarmCondition.java b/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GlobalAlarmCondition.java
index 7747840..79cf543 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GlobalAlarmCondition.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GlobalAlarmCondition.java
@@ -24,4 +24,6 @@
     String id;
     Date beginTime;
     Date endTime;
+    String refreshTime;
+
 }

--
Gitblit v1.9.3