From 37e8ba46879a6094938ad685b1054eb6446ae749 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 五月 2020 19:13:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java |    3 ++-
 1 files changed, 2 insertions(+), 1 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 51c6b40..c4107cb 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
@@ -163,7 +163,8 @@
 	BigDecimal getRewardMoneyByDate(@Param("uid") Long uid, @Param("day")Integer dateType, 
 			@Param("type") Integer hbType, @Param("orderState") Integer orderState,
 			@Param("orderNo") String orderNo, @Param("moneyState") Integer moneyState,  
-			@Param("startTime") String startTime, @Param("endTime") String endTime,@Param("listSource") List<Integer> listSource);
+			@Param("startTime") String startTime, @Param("endTime") String endTime,
+			@Param("listSource") List<Integer> listSource, @Param("notBackSuVip") boolean notBackSuVip);
 
 	/**
 	 * 缁熻鍚勪釜璁㈠崟绫诲瀷 鏈夋晥涓暟

--
Gitblit v1.8.0