From e4a56b57d3e10b9b46eaefe5194bbf98fcc45698 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 11 七月 2019 18:41:09 +0800
Subject: [PATCH] Merge branch 'master' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/goods/CollectionGoodsV2Service.java |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/CollectionGoodsV2Service.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/CollectionGoodsV2Service.java
index dba88ba..1dfc10c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/CollectionGoodsV2Service.java
+++ b/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;
 
 }

--
Gitblit v1.8.0