From 26b5b1a6bbbb5ff64dc2ec73cf8b11f1aa61c1c5 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:03:25 +0800
Subject: [PATCH] Merge branch 'div_8'

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java
index b1e7126..eb3ce8b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java
@@ -24,6 +24,7 @@
 		cg.setGoodsId(goods.getAuctionId());
 		cg.setGoodsType(CommonGoods.GOODS_TYPE_TB);
 		cg.setPicture(goods.getPictUrl());
+		cg.setPictureWhite(goods.getPictUrlWhite());
 		cg.setPrice(goods.getZkPrice());
 		cg.setSales(goods.getBiz30day());
 		cg.setRate(goods.getTkRate());
@@ -38,6 +39,8 @@
 		// 淇濈暀瀛楁
 		cg.setVideoCover(null);
 		cg.setVideoUrl(null);
+		cg.setState(goods.getState());
+		cg.setMaterialLibType(goods.getMaterialLibType());
 		return cg;
 	}
 

--
Gitblit v1.8.0