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/service/impl/AlarmServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/alarm/service/impl/AlarmServiceImpl.java b/src/main/java/org/springblade/modules/alarm/service/impl/AlarmServiceImpl.java
index 93c04e4..b834afc 100644
--- a/src/main/java/org/springblade/modules/alarm/service/impl/AlarmServiceImpl.java
+++ b/src/main/java/org/springblade/modules/alarm/service/impl/AlarmServiceImpl.java
@@ -84,8 +84,8 @@
 	}
 
 	@Override
-	public void updateJtype(String id,String czTime,String bz) {
-		baseMapper.updateJtype(id,czTime,bz);
+	public void updateJtype(String id,String czTime,String bz,String jjTime) {
+		baseMapper.updateJtype(id,czTime,bz,jjTime);
 	}
 
 }

--
Gitblit v1.9.3