From 9d8dfb01ff72c57abad3b80f3d65e81a5354db03 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 12 七月 2019 09:10:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserShareGoodsRecordService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserShareGoodsRecordService.java
index 73b1aa9..a491090 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserShareGoodsRecordService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserShareGoodsRecordService.java
@@ -95,7 +95,7 @@
 	 * @param type
 	 * @throws UserShareGoodsRecordException
 	 */
-	public void saveSingleShareRecord(Long uid, Long auctionId) throws UserShareGoodsRecordException;
+	public void saveSingleShareRecord(Long uid, Long auctionId, Integer goodsType) throws UserShareGoodsRecordException;
 
 	
 	/**
@@ -105,7 +105,7 @@
 	 * @return
 	 * @throws UserShareGoodsRecordException
 	 */
-	public ShareGoodsRecordDTO addRecordGoodsDetail(Long uid, Long auctionId) throws UserShareGoodsRecordException;
+	public ShareGoodsRecordDTO addRecordGoodsDetail(Long uid, Long auctionId, Integer goodsType) throws UserShareGoodsRecordException;
 
 	/**
 	 * 閫夊搧搴撳晢鍝佸垎浜�
@@ -114,7 +114,7 @@
 	 * @return
 	 * @throws UserShareGoodsRecordException
 	 */
-	public ShareGoodsRecordDTO addRecordGoodsStorage(Long uid,List<TaoBaoGoodsBrief> listGoodsBrief) throws UserShareGoodsRecordException;
+	public ShareGoodsRecordDTO addRecordGoodsStorage(Long uid,List<TaoBaoGoodsBrief> listGoodsBrief, List<Long> listStorageID) throws UserShareGoodsRecordException;
 
 	/**
 	 * 鑰佺増鍔ㄦ�佸垎浜�

--
Gitblit v1.8.0