From 670bc85ba8468dbe9a427abc54f2bca9d4e71749 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 23 Apr 2021 16:32:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.java
index 14508b6..e07e03f 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.java
@@ -47,7 +47,7 @@
 	 * @param endTime
 	 * @return
 	 */
-	List<JingdanVO> selectList(IPage page,String waringType, String beginTime, String endTime, String addvcd, String type);
+	List<JingdanVO> selectList(String waringType, String beginTime, String endTime, String district, String type);
 	List<JingdanVO> selectLists(String handleP, String type);
 
 	/**
@@ -57,11 +57,12 @@
 	 */
 	List<JingdanVO> selectdInfo(String deviceNumber, String id);
 
-	int insert(String galarmPeople, String phoneNumber, String place, String content,
+	int inserts(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 czTime, String bz);
 	void deletejd(String id);
 	void updateInfo(String id, String handleP, String handName, String handletype, String type);
 
+	int submitReId(JingdanVO jingdanVO);
 }

--
Gitblit v1.9.3