Merge remote-tracking branch 'origin/master'

src/main/resources/templates/www/tuiyijunren/content-fhjd.html

@@ -3,7 +3,7 @@
 <!--头部结束-->
 <!--中间内容开始-->
 <div class="er_content">
-	<div class="dqwz"><span>当前位置：<a href="${frontPath}/${site.siteId}">网站首页</a>><a href="${frontPath}/${site.siteId}/1237.html">孵化基地</a>><a href="${frontPath}/${site.siteId}/${category.categoryId}.html">${category.categoryName}</a></span></div>
+	<div class="dqwz"><span>当前位置：<a href="${frontPath}/${site.siteId}">网站首页</a>><a href="${frontPath}/${site.siteId}/1238.html">孵化基地</a>><a href="${frontPath}/${site.siteId}/${category.categoryId}.html">${category.categoryName}</a></span></div>
 	<div class="news_txt">
 		<h1>${content.title!}</h1>
 		<h5><i class="laiy">来源：${content.author!}</i><i class="date">时间：${content.inputdate,dateFormat="yyyy-MM-dd"}</i></h5>

src/main/resources/templates/www/tuiyijunren/content-zhfw.html

@@ -3,7 +3,7 @@
 <!--头部结束-->
 <!--中间内容开始-->
 <div class="er_content">
-	<div class="dqwz"><span>当前位置：<a href="${frontPath}/${site.siteId}">网站首页</a>><a href="${frontPath}/${site.siteId}/1232.html">综合服务</a>><a href="${frontPath}/${site.siteId}/${category.categoryId}.html">${category.categoryName}</a></span></div>
+	<div class="dqwz"><span>当前位置：<a href="${frontPath}/${site.siteId}">网站首页</a>><a href="${frontPath}/${site.siteId}/1236.html">综合服务</a>><a href="${frontPath}/${site.siteId}/${category.categoryId}.html">${category.categoryName}</a></span></div>
 	<div class="news_txt">
 		<h1>${content.title!}</h1>
 		<h5><i class="laiy">来源：${content.author!}</i><i class="date">时间：${content.inputdate,dateFormat="yyyy-MM-dd"}</i></h5>

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

@@ -16,7 +16,7 @@
             <#cms_pagination siteId="${site.siteId}" categoryId="${categoryId}" page="${page}" moreNum="6" var="page">
                 <#cms_content_list pageNumber="${page.current}" siteId="${site.siteId}" categoryId="${categoryId}" orderBy="3" isHot="0" hasChild="0" isRecommend="0" size="4" titleLen="22" var="bean">
                     <a class="news_list_div clearfix" href="${bean.url!}">
-                        <img src="${bean.thumb!}" alt="${bean.title!}"/>
+                        <img src="${bean.thumb!}" alt="${bean.title!}" style="width: 150px !important;"/>
                         <div class="news_list_text">
                             <h2>${bean.title!}</h2>
                             <h2>${bean.category.categoryId!}</h2>