From 2297c50a14f92dd869edae212d4aabe8f0bf0572 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sun, 25 Apr 2021 21:21:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java
index f60ad82..c9cf51e 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java
@@ -87,6 +87,8 @@
 
 	List<Map<String, Object>> getAlarm(AlarmVO alarmVO);
 
+	List<Map<String, Object>> getAlarming(AlarmVO alarmVO);
+
 	boolean setAlarm(AlarmVO alarmVO);
 
 	/**

--
Gitblit v1.9.3