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/MsgAccountDetail.java | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgAccountDetail.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgAccountDetail.java
index 84bca3f..86b3aae 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgAccountDetail.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgAccountDetail.java
@@ -16,23 +16,31 @@
@Table("yeshi_ec_msg_account")
public class MsgAccountDetail {
public enum MsgTypeAccountTypeEnum {
- bingding("璐﹀彿缁戝畾"),
- cancelBinding("鍙栨秷缁戝畾"),
- bingdingChange("缁戝畾鏇存崲"),
- update("璐﹀彿淇敼"),
- level("璐﹀彿绛夌骇"),
- connect("璐﹀彿鍚堝苟"),
- taoBaoAuthFail("璐﹀彿缁戝畾"),
- vipApply("璐︽埛鍗囩骇"),
- vipPgrade("璐︽埛鍗囩骇");
+ bingding("璐﹀彿缁戝畾", "http://img.flqapp.com/resource/msg/icon_msg_account.png"),
+ cancelBinding("鍙栨秷缁戝畾", "http://img.flqapp.com/resource/msg/icon_msg_account.png"),
+ bingdingChange("缁戝畾鏇存崲", "http://img.flqapp.com/resource/msg/icon_msg_account.png"),
+ update("璐﹀彿淇敼", "http://img.flqapp.com/resource/msg/icon_msg_account.png"),
+ level("璐﹀彿绛夌骇", "http://img.flqapp.com/resource/msg/icon_msg_account.png"),
+ connect("璐﹀彿鍚堝苟", "http://img.flqapp.com/resource/msg/icon_msg_account.png"),
+ taoBaoAuthFail("璐﹀彿缁戝畾", "http://img.flqapp.com/resource/msg/icon_msg_account.png"),
+ changeCode("璐﹀彿淇敼", "http://img.flqapp.com/resource/msg/icon_msg_account.png"),
+ vipApply("璐︽埛鍗囩骇", "http://img.flqapp.com/resource/msg/icon_msg_account.png"),
+ vipPgrade("绛夌骇鎴愰暱","http://img.flqapp.com/resource/msg/icon_msg_level.png");
+
private final String desc;
+ private final String icon;
- private MsgTypeAccountTypeEnum(String desc) {
+ private MsgTypeAccountTypeEnum(String desc, String icon) {
this.desc = desc;
+ this.icon = icon;
}
public String getDesc() {
return desc;
+ }
+
+ public String getIcon() {
+ return icon;
}
}
@@ -55,6 +63,8 @@
@Column(name = "ma_update_time")
private Date updateTime;
+ private String extraInfo;// 鏂扮増娑堟伅鍐呭
+
public Long getId() {
return id;
}
@@ -126,4 +136,12 @@
public void setBeiZhu(String beiZhu) {
this.beiZhu = beiZhu;
}
+
+ public String getExtraInfo() {
+ return extraInfo;
+ }
+
+ public void setExtraInfo(String extraInfo) {
+ this.extraInfo = extraInfo;
+ }
}
--
Gitblit v1.8.0