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/dto/share/ShareGoodsRecordDTO.java | 42 +++++++++++++++++++++++++++++++-----------
1 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dto/share/ShareGoodsRecordDTO.java b/fanli/src/main/java/com/yeshi/fanli/dto/share/ShareGoodsRecordDTO.java
index 879df46..2283136 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dto/share/ShareGoodsRecordDTO.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dto/share/ShareGoodsRecordDTO.java
@@ -3,7 +3,7 @@
import java.util.List;
import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord.ShareSourceTypeEnum;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.fanli.entity.goods.CommonGoods;
public class ShareGoodsRecordDTO {
@@ -14,8 +14,12 @@
private String redisKey;
private ShareSourceTypeEnum source;
private Long auctionId;
- private List<TaoBaoGoodsBrief> listGoodsBrief;
+ private Integer goodsType;
+ private List<CommonGoods> listGoods;
private List<Long> listId;
+ // 鏄惁鍒涘缓娣樼ぜ閲�
+ private boolean isTaolijin;
+
public Long getUid() {
return uid;
@@ -29,16 +33,8 @@
return shareId;
}
- public void setShareId(Long shareId) {
+ public void setShareId(Long shareId) {
this.shareId = shareId;
- }
-
- public List<TaoBaoGoodsBrief> getListGoodsBrief() {
- return listGoodsBrief;
- }
-
- public void setListGoodsBrief(List<TaoBaoGoodsBrief> listGoodsBrief) {
- this.listGoodsBrief = listGoodsBrief;
}
public String getRedisKey() {
@@ -89,4 +85,28 @@
this.listId = listId;
}
+ public Integer getGoodsType() {
+ return goodsType;
+ }
+
+ public void setGoodsType(Integer goodsType) {
+ this.goodsType = goodsType;
+ }
+
+ public List<CommonGoods> getListGoods() {
+ return listGoods;
+ }
+
+ public void setListGoods(List<CommonGoods> listGoods) {
+ this.listGoods = listGoods;
+ }
+
+ public boolean isTaolijin() {
+ return isTaolijin;
+ }
+
+ public void setTaolijin(boolean isTaolijin) {
+ this.isTaolijin = isTaolijin;
+ }
+
}
--
Gitblit v1.8.0