Merge branch 'div'

yujian

2019-04-22 2c217c4f9e01bd2e764c7b62da1aaa89018d76d8

 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;

   }