From 395cd4c4caf01e1b3ad134834e5c1db284b59074 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 11 四月 2020 18:18:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOtherDetail.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 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 bbda2e1..4ac1d8a 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
@@ -30,6 +30,7 @@
taoLiJinExchange("鎺ㄥ箍绾㈠寘鍏戞崲閲戝竵","http://img.flqapp.com/resource/msg/icon_msg_other_system_give.png"),
give("璧犻��",""),
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"),
@@ -73,6 +74,10 @@
private Date createTime;
@Column(name = "mo_update_time")
private Date updateTime;
+
+ private String extraInfo;
+
+
// 鍒稿唴瀹�
private MsgOtherCouponContentDTO coupnContent;
@@ -189,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