From a0a5b70e0d0df9357d09542f20dc6633a986f328 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 六月 2019 11:06:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOtherDetail.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 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 71f8719..90b999e 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
@@ -6,6 +6,7 @@
import org.yeshi.utils.mybatis.Table;
import com.yeshi.fanli.dto.msg.MsgOtherCouponContentDTO;
+import com.yeshi.fanli.dto.msg.MsgOtherTaoLiJinContentDTO;
import com.yeshi.fanli.entity.bus.user.UserInfo;
/**
@@ -17,7 +18,9 @@
@Table("yeshi_ec_msg_other")
public class MsgOtherDetail {
public enum MsgTypeOtherTypeEnum {
- couponMianDan("鍏嶅崟鍒�"), couponWelfareMianDan("绂忓埄鍏嶅崟鍒�"), couponReward("濂栧姳鍒�");
+ couponMianDan("鍏嶅崟鍒�"), couponWelfareMianDan("绂忓埄鍏嶅崟鍒�"), couponReward("濂栧姳鍒�"),
+ taoLiJin("鎺ㄥ箍绾㈠寘");
+
private final String desc;
private MsgTypeOtherTypeEnum(String desc) {
@@ -51,6 +54,10 @@
// 鍒稿唴瀹�
private MsgOtherCouponContentDTO coupnContent;
+ // 娣樼ぜ閲戝弬鏁�
+ private MsgOtherTaoLiJinContentDTO taoLiJinContent;
+
+
public MsgOtherCouponContentDTO getCoupnContent() {
return coupnContent;
}
@@ -130,4 +137,12 @@
public void setSourceId(Long sourceId) {
this.sourceId = sourceId;
}
+
+ public MsgOtherTaoLiJinContentDTO getTaoLiJinContent() {
+ return taoLiJinContent;
+ }
+
+ public void setTaoLiJinContent(MsgOtherTaoLiJinContentDTO taoLiJinContent) {
+ this.taoLiJinContent = taoLiJinContent;
+ }
}
--
Gitblit v1.8.0