From 16f44651a78d00943aea51b26fc6a4f20518a648 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 15 Jan 2021 16:29:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.java b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.java
index 3d9ec19..d3d97e0 100644
--- a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.java
+++ b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.java
@@ -48,7 +48,7 @@
 	void deletejj(String id);
 
 	void s(Alarm alarm);
-	void updateJtype(String id,String czTime,String bz);
+	void updateJtype(String id,String czTime,String bz,String jjTime);
 	void updateOne(Alarm alarm);
 
 	List<Map<String, Object>> selectScount(String time);

--
Gitblit v1.9.3