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/controller/wxmp/v1/ConfigController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/ConfigController.java b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/ConfigController.java
index dddacd1..e41f8a0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/ConfigController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/ConfigController.java
@@ -15,7 +15,6 @@
import com.yeshi.fanli.dto.WXMPAcceptData;
import com.yeshi.fanli.entity.bus.homemodule.FloatAD;
-import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
import com.yeshi.fanli.entity.common.JumpDetailV2;
import com.yeshi.fanli.entity.push.DeviceActive;
import com.yeshi.fanli.entity.system.BusinessSystem;
@@ -30,6 +29,7 @@
import com.yeshi.fanli.service.inter.push.DeviceActiveService;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
+import com.yeshi.fanli.vo.homemodule.BannerVO;
import com.yeshi.fanli.vo.homemodule.FloatImgDetailVO;
import net.sf.json.JSONArray;
@@ -122,10 +122,10 @@
data.put("privacyProtocolLink", privacyProtocol);
// 鎴戠殑鐣岄潰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));
out.print(JsonUtil.loadTrueResult(data));
--
Gitblit v1.8.0