From 0b9ceeec9c387b1499486468779b5c67bec00113 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 23 Apr 2021 16:05:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java
index 72500b7..91f1a58 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java
@@ -53,10 +53,10 @@
 	void updateOne(Alarm alarm);
 	List<Map<String, Object>> selectScount(String time);
 	List<AlarmVO> selectListSe(String beginTime, String endTime);
-	void updateJtype(String id, String jtype, String bz);
-	void updateVaddress(String vaddress ,String jid);
+	void updateJtype(String id, String jtype, String bz,String securityArr);
+	void updateVaddress(String vaddress,String uids,String jid);
 	void updatePoliceStatus(String id, String status);
-	void updateAaddress(String aaddress ,String jid);
+	void updateAaddress(String aaddress,String jid);
 	List<Map<String, Object>> selectEq(String time);
 
 	/**

--
Gitblit v1.9.3