From e0d1a9a05fee8ef75ce8f5bd7107be32ec8c8e82 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 20 Mar 2021 08:55:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java |    2 +-
 1 files changed, 1 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 8940488..c130880 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,7 @@
 	void deletejj(String id);
 
 	void s(Alarm alarm);
-	void updateJtype(String id, String jtype, String bz);
+	void updateJtype(String id, String jtype, String bz,String jjtime);
 	void updatePoliceStatus(String id, String status);
 	void updateOne(Alarm alarm);
 

--
Gitblit v1.9.3