From a8c566a3b274058fe31feaf8e980b2334b9bf83a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 22 七月 2019 14:22:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 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