From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期二, 30 七月 2019 09:07:42 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java index 8d7399d..e0dc7d3 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java @@ -19,7 +19,6 @@ import com.yeshi.fanli.dto.common.CommonContentTypeEnum; import com.yeshi.fanli.entity.accept.AcceptData; import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture; -import com.yeshi.fanli.entity.taobao.SearchFilter; import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief; import com.yeshi.fanli.service.inter.goods.CommonTemplateContentService; import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService; @@ -89,7 +88,7 @@ } CommonContentResult result = commonTemplateContentService.getContentList(CommonContentTypeEnum.valueOf(key), - cid, page, Constant.PAGE_SIZE); + cid, page, 10); // 淇濈暀鏆傛椂涓嶅紑鍚紝寰呭悗缁紑鍚� List<SwiperPicture> bannerList = new ArrayList<>(); -- Gitblit v1.8.0