From d4156c11179e8c85ae635063377447c967ee055a Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 02 Jul 2021 11:25:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java
index ee6c4b9..b8453e0 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java
@@ -183,7 +183,7 @@
 	}
 
 	@Override
-	public List<Map<String, Object>> getAlarming(AlarmVO alarmVO) {
+	public List<AlarmVO> getAlarming(AlarmVO alarmVO) {
 		return baseMapper.getAlarming(alarmVO);
 	}
 

--
Gitblit v1.9.3