From ae3e722d471d7e844acd25f124a1fec42ac714a0 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 11 七月 2019 18:56:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCoupon.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCoupon.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCoupon.java
index d2e0116..094d7b4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCoupon.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCoupon.java
@@ -24,9 +24,10 @@
 	
 	
 	// 鏉ユ簮: 鏂颁汉鎶藉銆侀個璇峰鍔�
-	public final static String SOURCE_CHOUJIANG = "鏂颁汉鎶藉";
+	public final static String SOURCE_NEWBIES = "鏂颁汉鎶藉";
 	public final static String SOURCE_YAOQING = "閭�璇峰鍔�";
 	public final static String SOURCE_SYSTEM_PUSH = "绯荤粺璧犻��";
+	public final static String SOURCE_DAILY_REBATE = "濂栧姳鍒稿ぉ澶╂娊";
 	
 	@Expose
 	@Column(name = "usc_id")

--
Gitblit v1.8.0