From e8e2e233af733ca3ba625223e2fd2255165e6b70 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 02 四月 2020 16:49:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOtherDetail.java | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 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 ca0d2f8..83a4c1f 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,33 +20,39 @@
@Table("yeshi_ec_msg_other")
public class MsgOtherDetail {
public enum MsgTypeOtherTypeEnum {
- couponMianDan("鍏嶅崟鍒�"),
- couponWelfareMianDan("绂忓埄鍏嶅崟鍒�"),
- freeCouponBuy("鑷喘鍏嶅崟鍒�"),
- freeCouponGive("璧犻�佸厤鍗曞埜"),
- couponReward("濂栧姳鍒�"),
- taoLiJin("鎺ㄥ箍绾㈠寘"),
- taoLiJinExchange("鎺ㄥ箍绾㈠寘鍏戞崲閲戝竵"),
- give("璧犻��"),
- exchange("閲戝竵鍏戞崲"),
- couponActivate("鍏嶅崟鍒告縺娲�"),
- firstOrderReward("绮変笣棣栧崟濂栧姳閭�璇蜂汉閲戝竵"),
- systemGive("绯荤粺璧犻��"),
- passVIPApply("瓒呯骇浼氬憳"),
- rejectVIPApply("瓒呯骇浼氬憳"),
- teamVIPCallBoss ("娓╅Θ鎻愰啋"),
- teamSplitCallBoss ("閭�璇疯劚绂�"),
- vipUpgradeReward("vip鍗囩骇濂栧姳");
+ couponMianDan("鍏嶅崟鍒�",""),
+ couponWelfareMianDan("绂忓埄鍏嶅崟鍒�",""),
+ freeCouponBuy("鑷喘鍏嶅崟鍒�",""),
+ freeCouponGive("璧犻�佸厤鍗曞埜",""),
+ couponReward("濂栧姳鍒�",""),
+ taoLiJin("鎺ㄥ箍绾㈠寘",""),
+ taoLiJinExchange("鎺ㄥ箍绾㈠寘鍏戞崲閲戝竵",""),
+ give("璧犻��",""),
+ exchange("閲戝竵鍏戞崲",""),
+ couponActivate("鍏嶅崟鍒告縺娲�",""),
+ firstOrderReward("绮変笣棣栧崟濂栧姳閭�璇蜂汉閲戝竵",""),
+ systemGive("绯荤粺璧犻��",""),
+ passVIPApply("瓒呯骇浼氬憳",""),
+ rejectVIPApply("瓒呯骇浼氬憳",""),
+ teamVIPCallBoss ("娓╅Θ鎻愰啋",""),
+ teamSplitCallBoss ("閭�璇疯劚绂�",""),
+ vipUpgradeReward("绯荤粺璧犻��","http://img.flqapp.com/resource/msg/icon_msg_vip.png");
private final String desc;
+ private final String icon;
- private MsgTypeOtherTypeEnum(String desc) {
+ private MsgTypeOtherTypeEnum(String desc, String icon) {
this.desc = desc;
+ this.icon = icon;
}
public String getDesc() {
return desc;
}
+
+ public String getIcon() {
+ return icon;
+ }
}
@Column(name = "mo_id")
--
Gitblit v1.8.0