From b88cc45c2f4be66795df34a3f0bfcba35c7bc912 Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Sat, 27 Feb 2021 17:41:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/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 14508b6..a8a974f 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 addvcd, String type);
 	List<JingdanVO> selectLists(String handleP, String type);
 
 	/**

--
Gitblit v1.9.3