From cebb70396a159270ce84cb44caeafa82faa439a4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 18:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dto/share/ShareGoodsRecordDTO.java | 22 +++++++++++-----------
1 files changed, 11 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 8418eaf..a26975a 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 {
@@ -15,7 +15,7 @@
private ShareSourceTypeEnum source;
private Long auctionId;
private Integer goodsType;
- private List<TaoBaoGoodsBrief> listGoodsBrief;
+ private List<CommonGoods> listGoods;
private List<Long> listId;
public Long getUid() {
@@ -30,16 +30,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() {
@@ -98,4 +90,12 @@
this.goodsType = goodsType;
}
+ public List<CommonGoods> getListGoods() {
+ return listGoods;
+ }
+
+ public void setListGoods(List<CommonGoods> listGoods) {
+ this.listGoods = listGoods;
+ }
+
}
--
Gitblit v1.8.0