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

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java |    2 ++
 1 files changed, 2 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 1c8fe09..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());
@@ -39,6 +40,7 @@
 		cg.setVideoCover(null);
 		cg.setVideoUrl(null);
 		cg.setState(goods.getState());
+		cg.setMaterialLibType(goods.getMaterialLibType());
 		return cg;
 	}
 

--
Gitblit v1.8.0