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/v1/ConfigController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
index 2b010dd..4784d9b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
@@ -254,7 +254,7 @@
if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
// 鎴戠殑鐣岄潰banner
- List<SwiperPicture> banner = swiperPictureService.getByBannerCard("my_interface_banner");
+ List<SwiperPicture> banner = swiperPictureService.getByBannerCardAndVersion("my_interface_banner",acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
if (banner == null)
banner = new ArrayList<SwiperPicture>();
data.put("banner", JsonUtil.getApiCommonGson().toJson(banner));
--
Gitblit v1.8.0