From 439480489111ecb1863e2ad0ceb2ff18150366ef Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 22 Mar 2021 09:38:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java | 9 +++++++--
1 files changed, 7 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 9a87906..9eeb12f 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
@@ -98,8 +98,8 @@
}
@Override
- public void updateJtype(String id,String jtype,String bz,String jjtime) {
- baseMapper.updateJtype(id,jtype,bz,jjtime);
+ public void updateJtype(String id,String jtype,String bz) {
+ baseMapper.updateJtype(id,jtype,bz);
}
@Override
@@ -156,4 +156,9 @@
public List<Map<String, Object>> queryPoliceTime(List policeIdArr) {
return baseMapper.queryPoliceTime(policeIdArr);
}
+
+ @Override
+ public List<Map<String, Object>> queryBa() {
+ return baseMapper.queryBa();
+ }
}
--
Gitblit v1.9.3