From 670bc85ba8468dbe9a427abc54f2bca9d4e71749 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 23 Apr 2021 16:32:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java |    4 +++-
 1 files changed, 3 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 26193f7..afe844e 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
@@ -60,7 +60,7 @@
 	 */
 	List<AlarmVO> selectListSe(String beginTime, String endTime);
 	void s(Alarm alarm);
-	void updateJtype(String id, String jtype, String bz);
+	void updateJtype(String id, String jtype, String bz,String securityArr);
 	void updatePoliceStatus(String id, String status);
 	void updateOne(Alarm alarm);
 	void updateVaddress(String vaddress,String uids ,String jid);
@@ -94,6 +94,8 @@
 
 	List<Map<String, Object>> queryBa();
 
+	List<Map<String, Object>> getAlarm(AlarmVO alarm);
+
 	/**
 	 * 查询当前时间段一键求助报警总次数
 	 * @param conditionVo

--
Gitblit v1.9.3