From 59aced4fe04f7e2fdcca81cb9ef279a70522301e Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期三, 25 十二月 2019 12:30:44 +0800 Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div --- 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