From 1215065e40d634a443cc13e54eefd2b10dcb3061 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 03 十二月 2019 12:30:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java
index aa40d8d..5545366 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java
@@ -219,7 +219,7 @@
 	 * @return
 	 */
 	BigDecimal getRewardMoneyByDate(@Param("uid") Long uid, @Param("day")Integer dateType, 
-			@Param("type") Integer hbType, @Param("orderState") Integer orderState);
-	
-
+			@Param("type") Integer hbType, @Param("orderState") Integer orderState,
+			@Param("orderNo") String orderNo, @Param("source") Integer source,
+			@Param("startTime") String startTime, @Param("endTime") String endTime);
 }
\ No newline at end of file

--
Gitblit v1.8.0