From 824d003d330a25b1f5b1e9ed30e4ad868868c2ab Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 01 六月 2020 16:49:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java
index 88c55a2..d534cce 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java
@@ -183,7 +183,7 @@
 	 * @return
 	 */
 	public BigDecimal getRewardMoneyByToSearch(Long uid, Integer dateType, Integer hbType, Integer orderState, String orderNo,
-			 Integer moneyState, String startTime, String endTime, List<Integer> listSource);
+			 Integer moneyState, String startTime, String endTime, List<Integer> listSource, boolean notBackSuVip);
 
 	
 	public Long countOrderByTypeAndDate(Integer orderType, String preDay);

--
Gitblit v1.8.0