From a6673284d4ec0b7c11079c65d940c9443d86d11e Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 06 三月 2019 15:21:48 +0800
Subject: [PATCH] 冲突

---
 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 26122a2..740c510 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
@@ -151,7 +151,7 @@
 	 * 婵�娲荤鍒╁厤鍗曞埜
 	 * @param uid
 	 */
-	public void activatedWelfareFreeCoupon(Long uid);
+	public void activatedWelfareFreeCoupon(Long uid, String from);
 
 	/**
 	 * 鏇存柊鍒歌褰� 鈥斺�斿尮閰嶅厤鍗曞埜

--
Gitblit v1.8.0