From 6009c2c07cd32a76b32c8d63a5a017be695c5ea5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 26 八月 2019 15:19:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOtherDetail.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOtherDetail.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOtherDetail.java
index d056829..bb4d838 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOtherDetail.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOtherDetail.java
@@ -20,8 +20,8 @@
@Table("yeshi_ec_msg_other")
public class MsgOtherDetail {
public enum MsgTypeOtherTypeEnum {
- couponMianDan("鍏嶅崟鍒�"), couponWelfareMianDan("绂忓埄鍏嶅崟鍒�"), couponReward("濂栧姳鍒�"),
- taoLiJin("鎺ㄥ箍绾㈠寘"), give("璧犻��"), exchange("閲戝竵鍏戞崲");
+ couponMianDan("鍏嶅崟鍒�"), couponWelfareMianDan("绂忓埄鍏嶅崟鍒�"), freeCouponBuy("鑷喘鍏嶅崟鍒�"),
+ freeCouponGive("璧犻�佸厤鍗曞埜"), couponReward("濂栧姳鍒�"), taoLiJin("鎺ㄥ箍绾㈠寘"), give("璧犻��"), exchange("閲戝竵鍏戞崲");
private final String desc;
--
Gitblit v1.8.0