Merge remote-tracking branch 'origin/master'

admin

2019-04-15 debb3a579f798d71072f037f74e3e6b43b5fe0ee

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

@@ -24,6 +24,7 @@
      cg.setGoodsId(goods.getAuctionId());

      cg.setGoodsType(CommonGoods.GOODS_TYPE_TB);

      cg.setPicture(goods.getPictUrl());

      cg.setPictureWhite(goods.getPictUrlWhite());

      cg.setPrice(goods.getZkPrice());

      cg.setSales(goods.getBiz30day());

      cg.setRate(goods.getTkRate());

@@ -39,6 +40,7 @@
      cg.setVideoCover(null);

      cg.setVideoUrl(null);

      cg.setState(goods.getState());

      cg.setMaterialLibType(goods.getMaterialLibType());

      return cg;

   }