From c302589567b7b556d8dfd7fca8cf3cf215d1a390 Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Wed, 24 Feb 2021 20:31:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java |    5 +++++
 1 files changed, 5 insertions(+), 0 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 0dc6ced..52a28b1 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
@@ -43,6 +43,11 @@
 	}
 
 	@Override
+	public List<AlarmVO> listAll() {
+		return baseMapper.listAll();
+	}
+
+	@Override
 	public List<AlarmVO> selectList(String jtype,String district,String waringType,String beginTime,String endTime) {
 		return baseMapper.selectList(jtype,district,waringType,beginTime,endTime);
 	}

--
Gitblit v1.9.3