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/service/impl/AlarmServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 3aaec12..58c6022 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,8 +43,8 @@
}
@Override
- public List<AlarmVO> selectList(String jtype,String addvcd,String waringType,String beginTime,String endTime) {
- return baseMapper.selectList(jtype,addvcd,waringType,beginTime,endTime);
+ public List<AlarmVO> selectList(String jtype,String district,String waringType,String beginTime,String endTime) {
+ return baseMapper.selectList(jtype,district,waringType,beginTime,endTime);
}
@Override
--
Gitblit v1.9.3