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/impl/AlarmServiceImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 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 b256cbc..0ec8c89 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
@@ -97,13 +97,13 @@
 	}
 
 	@Override
-	public void updateJtype(String id,String jtype,String bz) {
-		baseMapper.updateJtype(id,jtype,bz);
+	public void updateJtype(String id,String jtype,String bz,String securityArr) {
+		baseMapper.updateJtype(id,jtype,bz,securityArr);
 	}
 
 	@Override
-	public void updateVaddress(String vaddress, String jid) {
-		baseMapper.updateVaddress(vaddress, jid);
+	public void updateVaddress(String vaddress,String uids, String jid) {
+		baseMapper.updateVaddress(vaddress,uids ,jid);
 	}
 
 	@Override

--
Gitblit v1.9.3