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/brand/BrandClassShopService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandClassShopService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandClassShopService.java
index 3d58141..11ec69d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandClassShopService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandClassShopService.java
@@ -105,7 +105,7 @@
 	 * @param cid
 	 * @return
 	 */
-	public JSONObject listEffectiveCacheV2(int page, Long cid);
+	public JSONObject listEffectiveCacheV2(int page, Long cid,String platform,String version);
 
 	
 	/**
@@ -115,7 +115,7 @@
 	 * @param cid
 	 * @return
 	 */
-	public List<TaoBaoShopVO> listEffectiveShop(long start, int count, Long cid);
+	public List<TaoBaoShopVO> listEffectiveShop(long start, int count, Long cid,String platform,String version);
 
 	
 	

--
Gitblit v1.8.0