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/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 c4b6d45..91ebeb1 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
@@ -20,4 +20,5 @@
     public void receiveAlarm(String topic,String message);
     public Map<String,Object> selectAlarmLogsCount();
     Object selectAlarmList(Integer command, String beginTime, String endTime,Integer pageNum,Integer pageSize);
+    public List<GlobalAlarmData> selectThermalMap(GlobalAlarmCondition condition);
 }

--
Gitblit v1.9.3