From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOtherDetail.java |   55 +++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 37 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..9c350e0 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,32 +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("鍏嶅崟鍒�","http://img.flqapp.com/resource/msg/icon_msg_other_coupon.png"),
+		couponWelfareMianDan("绂忓埄鍏嶅崟鍒�","http://img.flqapp.com/resource/msg/icon_msg_other_coupon.png"),
+		freeCouponBuy("鑷喘鍏嶅崟鍒�","http://img.flqapp.com/resource/msg/icon_msg_other_coupon.png"),
+		freeCouponGive("璧犻�佸厤鍗曞埜","http://img.flqapp.com/resource/msg/icon_msg_other_coupon.png"),
+		couponReward("濂栧姳鍒�","http://img.flqapp.com/resource/msg/icon_msg_other_coupon.png"),
+		couponActivate("鍏嶅崟鍒告縺娲�","http://img.flqapp.com/resource/msg/icon_msg_other_coupon.png"),
+		taoLiJin("鎺ㄥ箍绾㈠寘","http://img.flqapp.com/resource/msg/icon_msg_other_tlj.png"),
+		taoLiJinExchange("鎺ㄥ箍绾㈠寘鍏戞崲閲戝竵","http://img.flqapp.com/resource/msg/icon_msg_other_system_give.png"),
+		give("璧犻��","http://img.flqapp.com/resource/msg/icon_msg_other_integral.png"),
+		exchange("閲戝竵鍏戞崲","http://img.flqapp.com/resource/msg/icon_msg_other_integral.png"),
+		goldCoin("閲戝竵","http://img.flqapp.com/resource/msg/icon_msg_other_integral.png"),
+		firstOrderReward("绮変笣棣栧崟濂栧姳閭�璇蜂汉閲戝竵","http://img.flqapp.com/resource/msg/icon_msg_other_integral.png"),
+		systemGive("绯荤粺璧犻��","http://img.flqapp.com/resource/msg/icon_msg_other_system_give.png"),
+		passVIPApply("瓒呯骇浼氬憳","http://img.flqapp.com/resource/msg/icon_msg_vip.png"),
+		rejectVIPApply("瓒呯骇浼氬憳","http://img.flqapp.com/resource/msg/icon_msg_vip.png"),
+		teamVIPCallBoss ("娓╅Θ鎻愰啋","http://img.flqapp.com/resource/msg/icon_msg_notify.png"),
+		teamSplitCallBoss ("閭�璇疯劚绂�","http://img.flqapp.com/resource/msg/icon_msg_invite_break.png"),
+		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;
 		}
 	}
 
@@ -67,6 +74,10 @@
 	private Date createTime;
 	@Column(name = "mo_update_time")
 	private Date updateTime;
+	
+	private String extraInfo;
+	
+	
 
 	// 鍒稿唴瀹�
 	private MsgOtherCouponContentDTO coupnContent;
@@ -183,4 +194,12 @@
 	public void setExchangeContent(MsgOtherExchangeContentDTO exchangeContent) {
 		this.exchangeContent = exchangeContent;
 	}
+
+	public String getExtraInfo() {
+		return extraInfo;
+	}
+
+	public void setExtraInfo(String extraInfo) {
+		this.extraInfo = extraInfo;
+	}
 }

--
Gitblit v1.8.0