Merge remote-tracking branch 'origin/master'

admin

2018-12-18 b83b2721486ec682ec6d8e3e850991b3fcd93324

 fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java

@@ -38,6 +38,7 @@
      // 保留字段

      cg.setVideoCover(null);

      cg.setVideoUrl(null);

      cg.setState(goods.getState());

      return cg;

   }