From b47abee8e59cfb2a5af241d34b397e41eed0155a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 29 八月 2019 12:01:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOtherDetail.java | 3 ++-
1 files changed, 2 insertions(+), 1 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 bb4d838..67656da 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
@@ -21,7 +21,8 @@
public class MsgOtherDetail {
public enum MsgTypeOtherTypeEnum {
couponMianDan("鍏嶅崟鍒�"), couponWelfareMianDan("绂忓埄鍏嶅崟鍒�"), freeCouponBuy("鑷喘鍏嶅崟鍒�"),
- freeCouponGive("璧犻�佸厤鍗曞埜"), couponReward("濂栧姳鍒�"), taoLiJin("鎺ㄥ箍绾㈠寘"), give("璧犻��"), exchange("閲戝竵鍏戞崲");
+ freeCouponGive("璧犻�佸厤鍗曞埜"), couponReward("濂栧姳鍒�"), taoLiJin("鎺ㄥ箍绾㈠寘"), give("璧犻��"), exchange("閲戝竵鍏戞崲")
+ , couponActivate("鍏嶅崟鍒告縺娲�");
private final String desc;
--
Gitblit v1.8.0