Merge remote-tracking branch 'origin/master'

admin

2019-03-01 bb688ff2b4b42bc440a8e7145f53e9030073fa6a

 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());