Merge branch 'master' into div1

yujian

2018-12-29 2dff570ccfa532f8c012bc13829b302dd3e1b9d3

 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;

   }