From 4c31405418bdd063605f1e5821d99f85be02f23c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 19 七月 2019 15:54:12 +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/CommonContentController.java |    2 +-
 1 files changed, 1 insertions(+), 1 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 092731c..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
@@ -88,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