Merge remote-tracking branch 'origin/main'

This commit is contained in:
1152958806@qq.com 2023-08-28 02:07:59 +08:00
commit c832e82c9d
2 changed files with 4 additions and 4 deletions

View File

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = '404')}" <html lang="en" th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = '404', title = '404')}"
xmlns:th="http://www.thymeleaf.org"> xmlns:th="http://www.thymeleaf.org">
<th:block th:fragment="content"> <th:block th:fragment="content">
@ -10,7 +10,7 @@
<!-- 头部导航栏 --> <!-- 头部导航栏 -->
<div> <div>
<header class="not-top-img" id="page-header"> <header class="not-top-img" id="page-header">
<nav th:replace="~{modules/nav :: nav(title = null)}"></nav> <nav th:replace="~{modules/nav :: nav(title = '404')}"></nav>
</header> </header>
</div> </div>
<div id="error-wrap"> <div id="error-wrap">

View File

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = '500')}" <html lang="en" th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = '500', title = '500')}"
xmlns:th="http://www.thymeleaf.org"> xmlns:th="http://www.thymeleaf.org">
<th:block th:fragment="content"> <th:block th:fragment="content">
@ -10,7 +10,7 @@
<!-- 头部导航栏 --> <!-- 头部导航栏 -->
<div> <div>
<header class="not-top-img" id="page-header"> <header class="not-top-img" id="page-header">
<nav th:replace="~{modules/nav :: nav(title = null)}"></nav> <nav th:replace="~{modules/nav :: nav(title = '500')}"></nav>
</header> </header>
</div> </div>
<div id="error-wrap"> <div id="error-wrap">