Merge branch 'master' into div

yujian

2019-07-11 e4a56b57d3e10b9b46eaefe5194bbf98fcc45698

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

@@ -49,7 +49,7 @@
    *            -商品ID

    * @throws CollectionGoodsException

    */

   public void cancelCollectionByAuctionId(Long uid, Long auctionId) throws CollectionGoodsException;

   public void cancelCollectionByAuctionId(Long uid, Long auctionId, Integer goodsType) throws CollectionGoodsException;



   /**

    * 取消收藏

@@ -108,8 +108,5 @@
    * @param commonId

    */

   public void deteleBYByUidAndCommonId(Long uid, Long commonId);



	
   public void cancelCollectionByAuctionId(Long uid, Long auctionId, Integer goodsType) throws CollectionGoodsException;



}