From 047e1ec0b94317cc2a65657b4b101c5f769c3530 Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Fri, 29 Jan 2021 11:59:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/service/IJingdanService.java |    2 +-
 1 files changed, 1 insertions(+), 1 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 97d5252..5cbd7a4 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,7 +39,7 @@
 	 * @return
 	 */
 	IPage<JingdanVO> selectJingdanPage(IPage<JingdanVO> page, JingdanVO jingdan);
-	List<JingdanVO> selectList(String waringType, String beginTime, String endTime, String addvcd, String type);
+	IPage<JingdanVO> selectList(IPage<JingdanVO> page,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,

--
Gitblit v1.9.3