From 8e751a7ee99afce71ac615a6111228c5c785ee46 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 14 八月 2019 09:52:59 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/entity/integral/IntegralExchange.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/integral/IntegralExchange.java b/fanli/src/main/java/com/yeshi/fanli/entity/integral/IntegralExchange.java
index 1168830..a44f298 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/integral/IntegralExchange.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/integral/IntegralExchange.java
@@ -21,7 +21,7 @@
private static final long serialVersionUID = 1L;
public enum ExchangeTypeEnum {
- freeCouponBuy("鑷喘鍏嶅崟鍒�"), freeCouponGive("璧犻�佸厤鍗曞埜"), rebateCoupon("杩斿埄濂栧姳鍒�"), inviteCodeActivate("閭�璇风爜婵�娲诲崱"),
+ freeCouponBuy("鑷喘鍏嶅崟鍒�"), freeCouponGive("璧犻�佸厤鍗曞埜"), rebatePercentCoupon("杩斿埄濂栧姳鍒�"), inviteCodeActivate("閭�璇风爜婵�娲诲崱"),
inviteCodePublish("閭�璇风爜鍙戝竷鍗�"), taoLiJin("鎺ㄥ箍绾㈠寘"), cash("鐜伴噾绾㈠寘");
private final String desc;
--
Gitblit v1.8.0