From a8e45a802600ca1cde28fe8522a26635328bbd99 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 三月 2019 17:45:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCoupon.java |    2 +-
 1 files changed, 1 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 6a18693..d2e0116 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
@@ -26,7 +26,7 @@
 	// 鏉ユ簮: 鏂颁汉鎶藉銆侀個璇峰鍔�
 	public final static String SOURCE_CHOUJIANG = "鏂颁汉鎶藉";
 	public final static String SOURCE_YAOQING = "閭�璇峰鍔�";
-	public final static String SOURCE_SYSTEM_PUSH = "绯荤粺鎺ㄩ��";
+	public final static String SOURCE_SYSTEM_PUSH = "绯荤粺璧犻��";
 	
 	@Expose
 	@Column(name = "usc_id")

--
Gitblit v1.8.0