From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoShopService.java |    2 +-
 1 files changed, 1 insertions(+), 1 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 72ac6ef..9ae99d5 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
@@ -74,5 +74,5 @@
 	 * @param key
 	 * @return
 	 */
-	public List<TaoBaoShopVO> getShopByKeyV2(String key);
+	public List<TaoBaoShopVO> getShopByKeyV2(String key,String platform,String version);
 }

--
Gitblit v1.8.0