From 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 08 四月 2019 15:15:09 +0800
Subject: [PATCH] 冲突解决

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
index 2d3ff11..aa8ede9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
@@ -1456,7 +1456,7 @@
 
 			UserSystemCoupon userCoupon = new UserSystemCoupon();
 			userCoupon.setUid(uid);
-			userCoupon.setSource(UserSystemCoupon.SOURCE_CHOUJIANG);
+			userCoupon.setSource(UserSystemCoupon.SOURCE_NEWBIES);
 			userCoupon.setSystemCoupon(systemCoupon);
 			userCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
 			userCoupon.setStateActivated(stateActivated);

--
Gitblit v1.8.0