From dd6a31aae79b35ccf0e006704a4d9e1d950c57d6 Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期六, 23 五月 2020 09:55:58 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java | 5 +++-- 1 files changed, 3 insertions(+), 2 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 f2a3b1f..6427764 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 @@ -52,6 +52,7 @@ import com.yeshi.fanli.util.ThreadUtil; import com.yeshi.fanli.util.TimeUtil; import com.yeshi.fanli.util.VersionUtil; +import com.yeshi.fanli.vo.homemodule.BannerVO; import com.yeshi.fanli.vo.user.UserDialogBtnVO; import com.yeshi.fanli.vo.user.UserDialogVO; import com.yeshi.fanli.vo.user.VIPUpgradedNotifyVO; @@ -334,10 +335,10 @@ data.put("banner", new JSONArray()); } else { // 鎴戠殑鐣岄潰banner - List<SwiperPicture> banner = swiperPictureService.getByBannerCardAndVersion("my_interface_banner", + List<BannerVO> banner = swiperPictureService.getByBannerCardAndVersion("my_interface_banner", acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion())); if (banner == null) - banner = new ArrayList<SwiperPicture>(); + banner = new ArrayList<BannerVO>(); data.put("banner", JsonUtil.getApiCommonGson().toJson(banner)); } } -- Gitblit v1.8.0