From b63c28a0c24782753eae26892171dd1a0c8d1fe7 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期日, 05 五月 2019 12:19:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master_develop

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoShopService.java |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoShopService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoShopService.java
index 3c52b32..5af8bea 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoShopService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoShopService.java
@@ -21,35 +21,43 @@
 
 	/**
 	 * 搴楅摵淇℃伅
+	 * 
 	 * @param id
 	 * @return
 	 */
 	public TaoBaoShop selectByPrimaryKey(Long id);
 
-	
+	/**
+	 * 鑾峰彇搴楅摵淇℃伅
+	 * 
+	 * @param auctionId
+	 * @param sellerId
+	 * @return
+	 */
+	public TaoBaoShop getTaoBaoShop(Long auctionId, Long sellerId);
+
 	public int insertSelective(TaoBaoShop record);
-	
-	
+
 	public int updateByPrimaryKeySelective(TaoBaoShop record);
 
 	/**
 	 * 淇敼搴楅摵淇℃伅
+	 * 
 	 * @param file
 	 * @param id
 	 * @param shopName
 	 */
 	public void changeInfo(MultipartFile file, Long id, String shopName);
-	
-	
+
 	/**
 	 * 鏌ヨ搴楅摵淇℃伅銆佸苟杩斿洖閽�3涓晢鍝佹暟閲�
+	 * 
 	 * @param start
 	 * @param count
 	 * @param cid
 	 * @return
 	 */
 	public List<TaoBaoShopVO> listBrandShopinfo(long start, int count, Long cid);
-	
-	
+
 	long countBrandShopinfo(Long cid);
 }

--
Gitblit v1.8.0