Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-07-30 dadacf7c1065876248bec86cf17c06ca4be1b97c

 fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ShareGoodsService.java

@@ -118,7 +118,7 @@
    * @return

    * @throws ShareGoodsException

    */

   public TaoBaoLink getTaoLiJinLinkForBuy(Long uid, String specialId, Long auctionId) throws ShareGoodsException;

   public TaoBaoLink getTaoLiJinLinkForBuy(Long uid, String specialId, Long auctionId,String pid) throws ShareGoodsException;



   /**

    * 淘礼金 链接