From 075f6eceec6908178ba53b40b7794e2f90f74c92 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 09 一月 2019 17:40:10 +0800
Subject: [PATCH] 冲突解决

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushGoodsService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushGoodsService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushGoodsService.java
index 2065274..69ffc09 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushGoodsService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushGoodsService.java
@@ -49,9 +49,9 @@
 	 * @param pushTime
 	 * @return
 	 */
-	public List<PushGoods> listHistoryByPushTime(long start, int count, Date pushTime);
+	public List<PushGoods> listHistoryByPushTime(long start, int count, Long uid, Date pushTime);
 
-	public long countHistoryByPushTime(Date pushTime);
+	public long countHistoryByPushTime(Long uid, Date pushTime);
 
 	
 	/**

--
Gitblit v1.8.0