Merge remote-tracking branch 'origin/master'

admin

2019-02-27 9aa335f99a99c7e4b0e01b329bbd5d2c929fb3b8

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