From 616608ec1005bff373bc380ecc3bf02a1063497c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 19 八月 2019 17:42:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOtherDetail.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 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 90b999e..d056829 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,8 @@
import org.yeshi.utils.mybatis.Table;
import com.yeshi.fanli.dto.msg.MsgOtherCouponContentDTO;
+import com.yeshi.fanli.dto.msg.MsgOtherExchangeContentDTO;
+import com.yeshi.fanli.dto.msg.MsgOtherGiveContentDTO;
import com.yeshi.fanli.dto.msg.MsgOtherTaoLiJinContentDTO;
import com.yeshi.fanli.entity.bus.user.UserInfo;
@@ -19,7 +21,7 @@
public class MsgOtherDetail {
public enum MsgTypeOtherTypeEnum {
couponMianDan("鍏嶅崟鍒�"), couponWelfareMianDan("绂忓埄鍏嶅崟鍒�"), couponReward("濂栧姳鍒�"),
- taoLiJin("鎺ㄥ箍绾㈠寘");
+ taoLiJin("鎺ㄥ箍绾㈠寘"), give("璧犻��"), exchange("閲戝竵鍏戞崲");
private final String desc;
@@ -56,6 +58,12 @@
// 娣樼ぜ閲戝弬鏁�
private MsgOtherTaoLiJinContentDTO taoLiJinContent;
+
+ // 璧犻�佷俊鎭�
+ private MsgOtherGiveContentDTO giveContent;
+
+ // 閲戝竵鍏戞崲淇℃伅
+ private MsgOtherExchangeContentDTO exchangeContent;
public MsgOtherCouponContentDTO getCoupnContent() {
@@ -145,4 +153,20 @@
public void setTaoLiJinContent(MsgOtherTaoLiJinContentDTO taoLiJinContent) {
this.taoLiJinContent = taoLiJinContent;
}
+
+ public MsgOtherGiveContentDTO getGiveContent() {
+ return giveContent;
+ }
+
+ public void setGiveContent(MsgOtherGiveContentDTO giveContent) {
+ this.giveContent = giveContent;
+ }
+
+ public MsgOtherExchangeContentDTO getExchangeContent() {
+ return exchangeContent;
+ }
+
+ public void setExchangeContent(MsgOtherExchangeContentDTO exchangeContent) {
+ this.exchangeContent = exchangeContent;
+ }
}
--
Gitblit v1.8.0