From d5a8a64768db15ff6917e150358a954582e384fd Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 18 Mar 2021 18:18:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 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 47bb13c..716df96 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
@@ -143,7 +143,12 @@
 	}
 
 	@Override
-	public List queryPolice() {
+	public List<Map<String, Object>> queryPolice() {
 		return baseMapper.queryPolice();
 	}
+
+	@Override
+	public List<Map<String, Object>> queryPoliceTime(List policeIdArr) {
+		return baseMapper.queryPoliceTime(policeIdArr);
+	}
 }

--
Gitblit v1.9.3