From 83bed9e77878cbe11e797b58fa2c2a48061e4555 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 29 Jan 2021 11:45:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 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 a8a974f..14508b6 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(String waringType, String beginTime, String endTime, String addvcd, String type);
+	List<JingdanVO> selectList(IPage page,String waringType, String beginTime, String endTime, String addvcd, String type);
 	List<JingdanVO> selectLists(String handleP, String type);
 
 	/**

--
Gitblit v1.9.3