From 48934b8c3da5a6791d0805ff0c1d327da834cc2d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 29 六月 2020 16:39:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponCountMapper.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponCountMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponCountMapper.java
index 90eb18d..9cd39b3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponCountMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponCountMapper.java
@@ -125,7 +125,7 @@
 	 * @param preDay
 	 * @return
 	 */
-	BigDecimal countFreeMoneyByTypeAndDay(@Param("type") String type, @Param("preDay") String preDay);
+	BigDecimal countFreeMoneyByTypeAndDay(@Param("type") String type, @Param("preDay") String preDay, @Param("source") String source);
 	
 	
 	/**
@@ -134,7 +134,7 @@
 	 * @param preDay
 	 * @return
 	 */
-	BigDecimal countCouponNumByDay(@Param("type") String type, @Param("preDay") String preDay);
+	BigDecimal countCouponNumByDay(@Param("type") String type, @Param("preDay") String preDay, @Param("source") String source);
 	
 	
 	/**

--
Gitblit v1.8.0