Merge remote-tracking branch 'origin/master'

admin

2019-01-24 f617136cba7f851a32f6091d5adc3e80f0e224c2

 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java

@@ -1694,6 +1694,7 @@
      taoBaoGoods.setCouponStartFee(commonGoods.getCouponStartPrice());

      taoBaoGoods.setCouponTotalCount(commonGoods.getCouponTotalCount());

      taoBaoGoods.setPictUrl(commonGoods.getPicture());

      taoBaoGoods.setPictUrlWhite(commonGoods.getPictureWhite());

      taoBaoGoods.setSellerId(commonGoods.getSellerId());

      taoBaoGoods.setShopTitle(commonGoods.getSellerName());

      taoBaoGoods.setTitle(commonGoods.getTitle());