From a67506723c8c8e6f0d223b864eaa69423a2710a8 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 11 Mar 2021 16:48:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java |    2 ++
 1 files changed, 2 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 792c3c6..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,7 +40,9 @@
 	 * @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);
 	List<AlarmVO> selectInfo(String id);
 	List<AlarmVO> selecttx(String id);

--
Gitblit v1.9.3