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/mapper/AlarmMapper.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
index b5814c9..213a92b 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
@@ -40,6 +40,7 @@
 	 * @return
 	 */
 	List<AlarmVO> selectAlarmPage(IPage page, AlarmVO alarm);
+	List<AlarmVO> listAll();
 	List<AlarmVO> selectList(String jtype, String district, String waringType, String beginTime, String endTime);
 	List<AlarmVO> getLimit();
 	List<AlarmVO> selectListSe(String beginTime, String endTime);

--
Gitblit v1.9.3