Merge remote-tracking branch 'origin/dev' into dev

src/main/resources/templates/home/html/projectDetail.html

@@ -40,7 +40,7 @@
                     <li>
                         <a th:href="@{/home}">首页</a>
                     </li>
-                    <li th:if="${navigation_id!=2}" class="active"><a th:href="@{/serviceleague/home/projectApplyList}">[[${navigation_name}]]</a>
+                    <li th:if="${navigation_id!=2}" class="active"><a th:href="@{'/home/informList/'+${navigation_id}}">[[${navigation_name}]]</a>
                     </li>
                     <li th:if="${navigation_id==2}" class="active"><a th:href="@{/home/unionCompany}">[[${navigation_name}]]</a>
                     </li>