From 2a93320d3adf8c72ea127df59d0bdd043917dd79 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 十一月 2019 15:12:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java
index 4e36e7e..40effa6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java
@@ -330,7 +330,7 @@
 	 * 婵�娲诲厤鍗曞埜---璁㈠崟宸插埌璐�   瑙﹀彂婵�娲诲厤鍗曞埜
 	 * @param uid
 	 */
-	public void triggerFreeCouponActivate(Long uid);
+	public void triggerFreeCouponActivate(Long uid, String orderNo, Integer source);
 
 	/**
 	 * 閫�鍥炲埜

--
Gitblit v1.8.0