From f34a510629676ebf22d75bde2e89e2fe4a2f56be Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 24 Mar 2021 18:22:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java |    5 ++++-
 1 files changed, 4 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 33df04f..814765e 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
@@ -51,7 +51,8 @@
 	void deletejj(String id);
 
 	void s(Alarm alarm);
-	void updateJtype(String id, String czTime, String bz);
+	void updateJtype(String id, String jtype, String bz);
+	void updatePoliceStatus(String id, String status);
 	void updateOne(Alarm alarm);
 
 	List<Map<String, Object>> selectScount(String time);
@@ -78,4 +79,6 @@
 	List<Map<String, Object>> queryPolice();
 
 	List<Map<String, Object>> queryPoliceTime(List policeIdArr);
+
+	List<Map<String, Object>> queryBa();
 }

--
Gitblit v1.9.3