From 61c0c3ccae4c23a90c405d7ac1cb49f7d5ee0479 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 12 九月 2023 09:48:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/alarm/global/service/IGlobalAlarmService.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/service/IGlobalAlarmService.java b/ard-work/src/main/java/com/ruoyi/alarm/global/service/IGlobalAlarmService.java
index ecdb659..c4b6d45 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/service/IGlobalAlarmService.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/service/IGlobalAlarmService.java
@@ -15,6 +15,7 @@
  **/
 public interface IGlobalAlarmService {
     public List<GlobalAlarmData> selectAlarmLogs(GlobalAlarmCondition condition);
+    public List<GlobalAlarmData> selectAlarmLogsAll();
     Object updateAlarmViewTime(GlobalAlarmCondition condition);
     public void receiveAlarm(String topic,String message);
     public Map<String,Object> selectAlarmLogsCount();

--
Gitblit v1.9.3