Merge remote-tracking branch 'origin/master' into master_develop

yujian

2019-05-13 0efda3a0ac631642dfe879487d7b93415363bbd4

 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;

   }