From 54ae34b91644b02c422b41197ae6ce33f4e3ca57 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 29 十月 2019 13:56:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/TokenRecord.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/TokenRecord.java
index fe1aa55..33541f8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/TokenRecord.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/TokenRecord.java
@@ -16,7 +16,7 @@
 	
 	// 鍙ｄ护绫诲瀷
 	public enum TokenTypeEnum {
-		freeCoupon("鍏嶅崟鍒�"), rebatePercentCoupon("杩斿埄姣旀彁鎴愬鍔卞埜"),taoLiJin("鎺ㄥ箍绾㈠寘"), ;
+		freeCoupon("鍏嶅崟鍒�"), rebatePercentCoupon("杩斿埄姣旀彁鎴愬鍔卞埜"),taoLiJin("鎺ㄥ箍绾㈠寘"),redPack("绾㈠寘") ;
 		private final String desc;
 
 		private TokenTypeEnum(String desc) {

--
Gitblit v1.8.0