Merge remote-tracking branch 'origin/master'

src/main/resources/templates/www/tuiyijunren/list-cyfw.html

@@ -14,7 +14,7 @@
 	<div class="er_right fl">
 		<div class="news_list">
 			<#cms_pagination siteId="${site.siteId}" categoryId="${categoryId}" page="${page}" moreNum="6" var="page">
-				<#cms_content_list siteId="${site.siteId}" categoryId="${categoryId}" orderBy="3" isHot="0" hasChild="0" isRecommend="0" size="8" titleLen="24" var="bean">
+				<#cms_content_list siteId="${site.siteId}" categoryId="${categoryId}" orderBy="3" isHot="0" hasChild="0" isRecommend="0" size="4" titleLen="24" var="bean">
 					<a class="news_list_div clearfix" href="${bean.url!}">
 						<img src="${bean.thumb!}" alt="${bean.title!}"/>
 						<div class="news_list_text">

src/main/resources/templates/www/tuiyijunren/list-xlts.html

@@ -14,7 +14,7 @@
 	<div class="er_right fl">
 		<div class="news_list">
 			<#cms_pagination siteId="${site.siteId}" categoryId="${categoryId}" page="${page}" moreNum="6" var="page">
-				<#cms_content_list siteId="${site.siteId}" categoryId="${categoryId}" orderBy="3" isHot="0" hasChild="0" isRecommend="0" size="8" titleLen="24" var="bean">
+				<#cms_content_list siteId="${site.siteId}" categoryId="${categoryId}" orderBy="3" isHot="0" hasChild="0" isRecommend="0" size="3" titleLen="24" var="bean">
 					<a class="news_list_div clearfix" href="${bean.url!}">
 						<img src="${bean.thumb!}" alt="${bean.title!}"/>
 						<div class="news_list_text">