From 7e51ff02bba60c1577e321d6a0d0f31474e0a2fa Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期二, 17 十二月 2019 15:16:31 +0800 Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div --- fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java index cc86dea..e347e07 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java @@ -430,7 +430,7 @@ JSONObject data = new JSONObject(); if (page == 1) { // 2銆侀《閮ㄨ疆鎾浘 - List<SwiperPicture> oldtopPicList = swiperPictureService.getByBannerCard("brand_picture"); + List<SwiperPicture> oldtopPicList = swiperPictureService.getByBannerCardAndVersion("brand_picture",acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion())); if (oldtopPicList != null && oldtopPicList.size() > 0) topPicList.addAll(oldtopPicList); TaoBaoShop taoBaoShop = taoBaoShopService.selectByPrimaryKey(id); @@ -747,7 +747,7 @@ if (page == 1 && array.size() > 0) { // 2銆侀《閮ㄨ疆鎾浘 List<SwiperPicture> topPicList = new ArrayList<>(); - List<SwiperPicture> oldtopPicList = swiperPictureService.getByBannerCard("brand_picture"); + List<SwiperPicture> oldtopPicList = swiperPictureService.getByBannerCardAndVersion("brand_picture",acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion())); if (oldtopPicList != null && oldtopPicList.size() > 0) topPicList.addAll(oldtopPicList); -- Gitblit v1.8.0