From 585b487cc71d06b2f76883f6f3b7247d1378874e Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 13 五月 2020 11:19:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/invite/ThreeSaleSerivce.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/invite/ThreeSaleSerivce.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/invite/ThreeSaleSerivce.java
index 20848e7..7aee496 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/invite/ThreeSaleSerivce.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/invite/ThreeSaleSerivce.java
@@ -1,5 +1,6 @@
 package com.yeshi.fanli.service.inter.user.invite;
 
+import java.util.Date;
 import java.util.List;
 
 import com.yeshi.fanli.entity.bus.user.ThreeSale;
@@ -308,7 +309,9 @@
 	 * List<ThreeSale> 杩斿洖绫诲瀷
 	 * @throws
 	 */
-	public List<ThreeSale> listAll(int page,int pageSize);
+	public List<ThreeSale> listAll(Date minTime,Date maxTime, int page,int pageSize);
+	
+	public long countAll(Date minTime,Date maxTime);
 
 	/**
 	 * 鏍规棩鏈熺被鍨嬭繘琛岀粺璁＄洿鎺�

--
Gitblit v1.8.0