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/apph5/AppH5SwiperPictureController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5SwiperPictureController.java b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5SwiperPictureController.java
index 251d0d7..4c33875 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5SwiperPictureController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5SwiperPictureController.java
@@ -14,6 +14,7 @@
import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.vo.homemodule.BannerVO;
import net.sf.json.JSONObject;
@@ -39,13 +40,13 @@
}
- List<SwiperPicture> list = swiperPictureService.getByBannerCard(card);
+ List<BannerVO> list = swiperPictureService.getByBannerCard(card);
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
}
- for (SwiperPicture swiperPicture: list) {
+ for (BannerVO swiperPicture: list) {
swiperPicture.setBannerId(null);
swiperPicture.setCreatetime(null);
swiperPicture.setUpdatetime(null);
--
Gitblit v1.8.0