From db88b87df461820152d68d3d55a28f30c2da83e6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 20 九月 2019 17:54:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOtherDetail.java | 5 +++--
1 files changed, 3 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..68424de 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,9 @@
@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("閲戝竵鍏戞崲")
+ , couponActivate("鍏嶅崟鍒告縺娲�"), firstOrderReward("闃熷憳棣栧崟濂栧姳閭�璇蜂汉閲戝竵");
private final String desc;
--
Gitblit v1.8.0