From 2764ae2d7f4d9cb9810a2188c92cb2eb439c3f22 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 09 五月 2019 13:07:02 +0800
Subject: [PATCH] 冲突

---
 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