Merge remote-tracking branch 'origin/master'

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

@@ -5,7 +5,7 @@
 <div class="er_content clearfix">
 	<div class="er_left fl">
 		<div class="er_nav">
-			<h4>创业服务${categoryId}</h4>
+			<h4>创业服务</h4>
 			<#cms_category_list  siteId="${site.siteId}" categoryId="1226" isNav="0" var="bean">
 				<a id="${bean.categoryId}" href="${frontPath}/${site.siteId}/${bean.categoryId}.html">${bean.categoryName}</a>
 			</#cms_category_list>

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

@@ -5,7 +5,7 @@
 <div class="er_content clearfix">
 	<div class="er_left fl">
 		<div class="er_nav">
-			<h4>学历提升${categoryId}</h4>
+			<h4>学历提升</h4>
 			<#cms_category_list  siteId="${site.siteId}" categoryId="1229" isNav="0" var="bean">
 				<a id="${bean.categoryId}" href="${frontPath}/${site.siteId}/${bean.categoryId}.html">${bean.categoryName}</a>
 			</#cms_category_list>