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/jingdan/mapper/JingdanMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/jingdan/mapper/JingdanMapper.java b/src/main/java/org/springblade/modules/jingdan/mapper/JingdanMapper.java
index 3779d90..8513061 100644
--- a/src/main/java/org/springblade/modules/jingdan/mapper/JingdanMapper.java
+++ b/src/main/java/org/springblade/modules/jingdan/mapper/JingdanMapper.java
@@ -59,7 +59,7 @@
 	int insert(String galarmPeople,String phoneNumber,String place,String content,
 			   String galarmTime,String waringType,String deviceNumber,String type,String handleP,
 			   String handleTime,String handName,String level,String coordinate,String jd,String wd,
-			   String addvcd,String rName);
+			   String addvcd,String rName,String czTime,String bz);
 	void deletejd(String id);
 	void updateInfo(String id,String handleP,String handName,String handletype,String type);
 

--
Gitblit v1.9.3