Merge branch 'dev_2'

yujian

2019-05-14 1823108940bb5fda2d26787236dc5df3004bc0ec

 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;

   }