From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgInviteDetail.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgInviteDetail.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgInviteDetail.java
index bb6a8c2..5b17680 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgInviteDetail.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgInviteDetail.java
@@ -17,15 +17,27 @@
@Table("yeshi_ec_msg_invite")
public class MsgInviteDetail {
public enum MsgTypeInviteTypeEnum {
- invite("閭�璇锋秷鎭�"), exchangeCode("鎭枩浣狅紝閭�璇风爜鍏戞崲鎴愬姛"), receiveGift("棰嗗彇绀煎搧"),inviteNew("閭�璇锋秷鎭�-鏂扮増");
+ invite("閭�璇锋秷鎭�","http://img.flqapp.com/resource/msg/icon_msg_invite.png"),
+ exchangeCode("鎭枩浣狅紝閭�璇风爜鍏戞崲鎴愬姛","http://img.flqapp.com/resource/msg/icon_msg_invite.png"),
+ receiveGift("棰嗗彇绀煎搧","http://img.flqapp.com/resource/msg/icon_msg_invite.png"),
+ fansUpgrade("绮変笣鍗囩骇","http://img.flqapp.com/resource/msg/icon_msg_invite.png"),
+ fansDivorced("鑴辩鎻愰啋","http://img.flqapp.com/resource/msg/icon_msg_invite.png"),
+ inviteSucceed("閭�璇锋彁閱�","http://img.flqapp.com/resource/msg/icon_msg_invite.png");
+
private final String desc;
-
- private MsgTypeInviteTypeEnum(String desc) {
+ private final String icon;
+
+ private MsgTypeInviteTypeEnum(String desc, String icon) {
this.desc = desc;
+ this.icon = icon;
}
public String getDesc() {
return desc;
+ }
+
+ public String getIcon() {
+ return icon;
}
}
@@ -47,6 +59,8 @@
private Date createTime;
@Column(name = "mi_update_time")
private Date updateTime;
+
+ private String extraInfo;// 鏂扮増娑堟伅鍐呭
public Long getId() {
return id;
@@ -120,4 +134,12 @@
this.updateTime = updateTime;
}
+ public String getExtraInfo() {
+ return extraInfo;
+ }
+
+ public void setExtraInfo(String extraInfo) {
+ this.extraInfo = extraInfo;
+ }
+
}
--
Gitblit v1.8.0