From d1bf4588a39bcba69fd39f3cc3b3a6c439e25cb6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 19 十二月 2018 17:28:19 +0800
Subject: [PATCH] Merge branch 'master' into dev-moneydetail
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushGoodsMapper.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushGoodsMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushGoodsMapper.java
index 2325fdb..056dae0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushGoodsMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushGoodsMapper.java
@@ -49,7 +49,7 @@
* @return
*/
List<PushGoods> listHistoryByPushTime(@Param("start") long start, @Param("count") int count,
- @Param("pushTime") Date pushTime);
+ @Param("uid") Long uid, @Param("pushTime") Date pushTime);
/**
* 缁熻鍘嗗彶鎺ㄩ�佸晢鍝佷俊鎭�
@@ -58,7 +58,7 @@
* @param pushTime
* @return
*/
- long countHistoryByPushTime(@Param("pushTime") Date pushTime);
+ long countHistoryByPushTime(@Param("uid") Long uid, @Param("pushTime") Date pushTime);
/**
* 鏌ヨ宸叉帹閫佽褰�
--
Gitblit v1.8.0