Merge branch 'div'

yujian

2019-03-01 4cf31a2a8a01ba1a7c375b6cb6a7fff36960ba70

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