From 5a90071cd2797bcacc286fcad31a8b0b0875d6aa Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 03 Feb 2021 10:27:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 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 9e17c8e..792c3c6 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,7 @@
 	 * @return
 	 */
 	List<AlarmVO> selectAlarmPage(IPage page, AlarmVO alarm);
-	List<AlarmVO> selectList(String jtype, String addvcd, String waringType, String beginTime, String endTime);
+	List<AlarmVO> selectList(String jtype, String district, String waringType, String beginTime, String endTime);
 	List<AlarmVO> selectListSe(String beginTime, String endTime);
 	List<AlarmVO> selectInfo(String id);
 	List<AlarmVO> selecttx(String id);

--
Gitblit v1.9.3