From aad0554cc7f18a6ec05e2e5e646b5e501d41617d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 10 七月 2019 17:13:49 +0800
Subject: [PATCH] 冲突文件

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserGoodsStorageService.java |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserGoodsStorageService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserGoodsStorageService.java
index 7f9b6ac..2faa4b3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserGoodsStorageService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserGoodsStorageService.java
@@ -96,10 +96,4 @@
 	 */
 	public JSONObject shareGoods(Long uid, List<Long> listStorageID) throws UserGoodsStorageException, UserShareGoodsRecordException;
 
-	/**
-	 * 鏇存柊鍟嗗搧鐘舵�佷负宸插垎浜�
-	 * @param shareId 鍒嗕韩
-	 */
-	public void updateShareStateByCommonGoodsId(Long shareId);
-
 }

--
Gitblit v1.8.0