From d4b3ee96ac6093683fce254541b113fb6a762060 Mon Sep 17 00:00:00 2001
From: hexiaohui <hexiaohui@LAPTOP-03V48RSB>
Date: 星期三, 03 四月 2019 23:07:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

--
Gitblit v1.8.0