From 70f01fd17bb642c2f773d5c5567018d7573a2dde Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 12 Mar 2021 17:31:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/service/IJingdanService.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/service/IJingdanService.java
index 5cbd7a4..b810625 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/service/IJingdanService.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/service/IJingdanService.java
@@ -39,10 +39,10 @@
 	 * @return
 	 */
 	IPage<JingdanVO> selectJingdanPage(IPage<JingdanVO> page, JingdanVO jingdan);
-	IPage<JingdanVO> selectList(IPage<JingdanVO> page,String waringType, String beginTime, String endTime, String addvcd, String type);
+	List<JingdanVO> selectList(String waringType, String beginTime, String endTime, String addvcd, String type);
 	List<JingdanVO> selectLists(String handleP, String type);
 	List<JingdanVO> selectdInfo(String deviceNumber, String id);
-	void insert(String galarmPeople, String phoneNumber, String place, String content,
+	void 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);

--
Gitblit v1.9.3