From 91ddd96c12ec25aaf6d0cb38d54288d863ab2b58 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 10 七月 2021 18:10:38 +0800
Subject: [PATCH] 礼金红包兼容

---
 fanli/src/main/java/com/yeshi/fanli/dto/common/CommonContentResult.java |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dto/common/CommonContentResult.java b/fanli/src/main/java/com/yeshi/fanli/dto/common/CommonContentResult.java
index 5b9381a..9124499 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dto/common/CommonContentResult.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dto/common/CommonContentResult.java
@@ -3,18 +3,20 @@
 import java.io.Serializable;
 import java.util.List;
 
+import com.yeshi.fanli.entity.goods.CommonGoods;
 import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
 
 public class CommonContentResult implements Serializable {
 	private static final long serialVersionUID = 1L;
-	private List<TaoBaoGoodsBrief> goodsList;
+	private List<CommonGoods> goodsList;
 	private long count;
 
-	public List<TaoBaoGoodsBrief> getGoodsList() {
+
+	public List<CommonGoods> getGoodsList() {
 		return goodsList;
 	}
 
-	public void setGoodsList(List<TaoBaoGoodsBrief> goodsList) {
+	public void setGoodsList(List<CommonGoods> goodsList) {
 		this.goodsList = goodsList;
 	}
 
@@ -26,11 +28,11 @@
 		this.count = count;
 	}
 
-	public CommonContentResult(List<TaoBaoGoodsBrief> goodsList, long count) {
-		this.goodsList = goodsList;
-		this.count = count;
+	public CommonContentResult() {
 	}
 
-	public CommonContentResult() {
+	public CommonContentResult(List<CommonGoods> goodsList, long count) {
+		this.goodsList = goodsList;
+		this.count = count;
 	}
 }

--
Gitblit v1.8.0