vor 7 Jahren · faf83c61cc
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -25,7 +25,7 @@ user:
 
				 #Spring配置

			
 
				 spring:

			
 
				   thymeleaf:

			
 
				-    mode: LEGACYHTML5

			
 
				+    mode: HTML

			
 
				     cache: false

			
 
				   messages:

			
 
				     #国际化资源文件路径

			
--- a/src/main/resources/mybatis/system/UserMapper.xml
+++ b/src/main/resources/mybatis/system/UserMapper.xml
@@ -35,13 +35,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
				 	</resultMap>

			
 
				 	

			
 
				 	<select id="selectUserList" parameterType="User" resultMap="UserResult">

			
 
				-		select user_id, dept_id, login_name, user_name, email, phonenumber, password, sex, avatar, salt, status, create_by, create_time, remark from sys_user

			
 
				-		where status in (0,1)

			
 
				+		select u.user_id, u.dept_id, u.login_name, u.user_name, u.email, u.phonenumber, u.password, u.sex, u.avatar, u.salt, u.status, u.create_by, u.create_time, u.remark, d.dept_name from sys_user u

			
 
				+		left join sys_dept d on u.dept_id = d.dept_id

			
 
				+		where u.status in (0,1)

			
 
				 		<if test="searchValue != null and searchValue != ''">

			
 
				-			AND login_name like concat(concat('%', #{searchValue}), '%')

			
 
				+			AND u.login_name like concat(concat('%', #{searchValue}), '%')

			
 
				 		</if>

			
 
				 		<if test="deptId != null and parentId != null and parentId != 0">

			
 
				-			AND dept_id IN (SELECT dept_id FROM sys_dept WHERE dept_id = #{deptId} OR parent_id = #{deptId})

			
 
				+			AND u.dept_id IN (SELECT t.dept_id FROM sys_dept t WHERE t.dept_id = #{deptId} OR t.parent_id = #{deptId})

			
 
				 		</if>

			
 
				 	</select>

			
 
				 	

			
--- a/src/main/resources/static/ruoyi/system/user/user.js
+++ b/src/main/resources/static/ruoyi/system/user/user.js
@@ -23,6 +23,10 @@ function queryUserList() {
 
				             field: 'userName',

			
 
				             title: '用户名称'

			
 
				         },

			
 
				+        {

			
 
				+            field: 'dept.deptName',

			
 
				+            title: '部门'

			
 
				+        },

			
 
				         {

			
 
				             field: 'email',

			
 
				             title: '邮箱'

			
--- a/src/main/resources/templates/error/404.html
+++ b/src/main/resources/templates/error/404.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html>
			
 
				+<html lang="zh">
			
 
				 <head>
			
 
				     <meta charset="utf-8">
			
 
				     <meta name="viewport" content="width=device-width, initial-scale=1.0">
			
--- a/src/main/resources/templates/error/500.html
+++ b/src/main/resources/templates/error/500.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html>
			
 
				+<html lang="zh">
			
 
				 <head>
			
 
				     <meta charset="utf-8">
			
 
				     <meta name="viewport" content="width=device-width, initial-scale=1.0">
			
--- a/src/main/resources/templates/error/unauth.html
+++ b/src/main/resources/templates/error/unauth.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html>
			
 
				+<html lang="zh">
			
 
				 <head>
			
 
				     <meta charset="utf-8">
			
 
				     <meta name="viewport" content="width=device-width, initial-scale=1.0">
			
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>

			
 
				-<html xmlns:th="http://www.thymeleaf.org">

			
 
				+<html  lang="zh" xmlns:th="http://www.thymeleaf.org">

			
 
				 <head>

			
 
				     <meta charset="utf-8">

			
 
				     <meta name="viewport" content="width=device-width, initial-scale=1.0">

			
--- a/src/main/resources/templates/login.html
+++ b/src/main/resources/templates/login.html
@@ -1,6 +1,5 @@
 
				 <!DOCTYPE html>

			
 
				-<html lang="en">

			
 
				-<html xmlns:th="http://www.thymeleaf.org">

			
 
				+<html  lang="zh" xmlns:th="http://www.thymeleaf.org">

			
 
				 <head>

			
 
				     <meta charset="utf-8">

			
 
				     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">

			
--- a/src/main/resources/templates/main.html
+++ b/src/main/resources/templates/main.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>

			
 
				-<html>

			
 
				+<html  lang="zh" xmlns:th="http://www.thymeleaf.org">

			
 
				 <head>

			
 
				     <meta charset="utf-8">

			
 
				     <meta name="viewport" content="width=device-width, initial-scale=1.0">

			
--- a/src/main/resources/templates/monitor/job/add.html
+++ b/src/main/resources/templates/monitor/job/add.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html xmlns:th="http://www.w3.org/1999/xhtml">
			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
			
 
				 <meta charset="utf-8">
			
 
				 <head th:include="include :: header"></head>
			
 
				 <body class="white-bg">
			
--- a/src/main/resources/templates/monitor/job/edit.html
+++ b/src/main/resources/templates/monitor/job/edit.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html xmlns:th="http://www.w3.org/1999/xhtml">
			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
			
 
				 <meta charset="utf-8">
			
 
				 <head th:include="include :: header"></head>
			
 
				 <body class="white-bg">
			
--- a/src/main/resources/templates/monitor/job/job.html
+++ b/src/main/resources/templates/monitor/job/job.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html lang="zh_CN" xmlns:th="http://www.thymeleaf.org"
			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org"
			
 
				 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
			
 
				 <meta charset="utf-8">
			
 
				 <head th:include="include :: header"></head>
			
--- a/src/main/resources/templates/monitor/job/jobLog.html
+++ b/src/main/resources/templates/monitor/job/jobLog.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html lang="zh_CN" xmlns:th="http://www.thymeleaf.org"
			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org"
			
 
				 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
			
 
				 <meta charset="utf-8">
			
 
				 <head th:include="include :: header"></head>
			
--- a/src/main/resources/templates/monitor/logininfor/logininfor.html
+++ b/src/main/resources/templates/monitor/logininfor/logininfor.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>

			
 
				-<html lang="zh_CN" xmlns:th="http://www.thymeleaf.org"

			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org"

			
 
				 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">

			
 
				 <meta charset="utf-8">

			
 
				 <head th:include="include :: header"></head>

			
--- a/src/main/resources/templates/monitor/online/online.html
+++ b/src/main/resources/templates/monitor/online/online.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>

			
 
				-<html lang="zh_CN" xmlns:th="http://www.thymeleaf.org"

			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org"

			
 
				 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">

			
 
				 <meta charset="utf-8">

			
 
				 <head th:include="include :: header"></head>

			
--- a/src/main/resources/templates/monitor/operlog/detail.html
+++ b/src/main/resources/templates/monitor/operlog/detail.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>

			
 
				-<html lang="zh_CN" xmlns:th="http://www.thymeleaf.org"

			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org"

			
 
				 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">

			
 
				 <meta charset="utf-8">

			
 
				 <head th:include="include :: header"></head>

			
--- a/src/main/resources/templates/monitor/operlog/operlog.html
+++ b/src/main/resources/templates/monitor/operlog/operlog.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>

			
 
				-<html lang="zh_CN" xmlns:th="http://www.thymeleaf.org"

			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org"

			
 
				 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">

			
 
				 <meta charset="utf-8">

			
 
				 <head th:include="include :: header"></head>

			
--- a/src/main/resources/templates/system/config/add.html
+++ b/src/main/resources/templates/system/config/add.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>

			
 
				-<html>

			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >

			
 
				 <meta charset="utf-8">

			
 
				 <head th:include="include :: header"></head>

			
 
				 <body class="white-bg">

			
--- a/src/main/resources/templates/system/config/config.html
+++ b/src/main/resources/templates/system/config/config.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>

			
 
				-<html lang="zh_CN" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">

			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">

			
 
				 <meta charset="utf-8">

			
 
				 <head th:include="include :: header"></head>

			
 
				 <body class="gray-bg">

			
--- a/src/main/resources/templates/system/config/edit.html
+++ b/src/main/resources/templates/system/config/edit.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>

			
 
				-<html>

			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >

			
 
				 <meta charset="utf-8">

			
 
				 <head th:include="include :: header"></head>

			
 
				 <body class="white-bg">

			
--- a/src/main/resources/templates/system/dept/add.html
+++ b/src/main/resources/templates/system/dept/add.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>

			
 
				-<html xmlns:th="http://www.w3.org/1999/xhtml">

			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >

			
 
				 <meta charset="utf-8">

			
 
				 <head th:include="include :: header"></head>

			
 
				 <body class="white-bg">

			
--- a/src/main/resources/templates/system/dept/dept.html
+++ b/src/main/resources/templates/system/dept/dept.html
@@ -1,5 +1,6 @@
 
				 <!DOCTYPE html>
			
 
				-<html xmlns:th="http://www.w3.org/1999/xhtml">
			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org"
			
 
				+	  xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
			
 
				 <meta charset="utf-8">
			
 
				 <head th:include="include :: header"></head>
			
 
				 <body class="gray-bg">
			
--- a/src/main/resources/templates/system/dept/edit.html
+++ b/src/main/resources/templates/system/dept/edit.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html xmlns:th="http://www.w3.org/1999/xhtml">
			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
			
 
				 <meta charset="utf-8">
			
 
				 <head th:include="include :: header"></head>
			
 
				 <body class="white-bg">
			
--- a/src/main/resources/templates/system/dept/tree.html
+++ b/src/main/resources/templates/system/dept/tree.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>

			
 
				-<html xmlns:th="http://www.w3.org/1999/xhtml">

			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >

			
 
				 <meta charset="utf-8">

			
 
				 <head th:include="include :: header"></head>

			
 
				 <link href="/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css" th:href="@{/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css}" rel="stylesheet"/>

			
--- a/src/main/resources/templates/system/dict/data/add.html
+++ b/src/main/resources/templates/system/dict/data/add.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>

			
 
				-<html xmlns:th="http://www.w3.org/1999/xhtml">

			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >

			
 
				 <meta charset="utf-8">

			
 
				 <head th:include="include :: header"></head>

			
 
				 <body class="white-bg">

			
--- a/src/main/resources/templates/system/dict/data/data.html
+++ b/src/main/resources/templates/system/dict/data/data.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>

			
 
				-<html lang="zh_CN" xmlns:th="http://www.thymeleaf.org"

			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org"

			
 
				 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">

			
 
				 <meta charset="utf-8">

			
 
				 <head th:include="include :: header"></head>

			
--- a/src/main/resources/templates/system/dict/data/edit.html
+++ b/src/main/resources/templates/system/dict/data/edit.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>

			
 
				-<html xmlns:th="http://www.w3.org/1999/xhtml">

			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >

			
 
				 <meta charset="utf-8">

			
 
				 <head th:include="include :: header"></head>

			
 
				 <body class="white-bg">

			
--- a/src/main/resources/templates/system/menu/add.html
+++ b/src/main/resources/templates/system/menu/add.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html xmlns:th="http://www.w3.org/1999/xhtml">
			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
			
 
				 <meta charset="utf-8">
			
 
				 <head th:include="include :: header"></head>
			
 
				 <link href="/ajax/libs/iCheck/custom.css" th:href="@{/ajax/libs/iCheck/custom.css}" rel="stylesheet"/>
			
--- a/src/main/resources/templates/system/menu/edit.html
+++ b/src/main/resources/templates/system/menu/edit.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html xmlns:th="http://www.w3.org/1999/xhtml">
			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
			
 
				 <meta charset="utf-8">
			
 
				 <head th:include="include :: header"></head>
			
 
				 <link href="/ajax/libs/iCheck/custom.css" th:href="@{/ajax/libs/iCheck/custom.css}" rel="stylesheet"/>
			
--- a/src/main/resources/templates/system/menu/icon.html
+++ b/src/main/resources/templates/system/menu/icon.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html lang="en">
			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
			
 
				 <head>
			
 
				     <meta charset="UTF-8">
			
 
				     <title>Font Awesome Ico list</title>
			
--- a/src/main/resources/templates/system/menu/menu.html
+++ b/src/main/resources/templates/system/menu/menu.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html xmlns:th="http://www.w3.org/1999/xhtml">
			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
			
 
				 <meta charset="utf-8">
			
 
				 <head th:include="include :: header"></head>
			
 
				 <body class="gray-bg">
			
--- a/src/main/resources/templates/system/menu/tree.html
+++ b/src/main/resources/templates/system/menu/tree.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html xmlns:th="http://www.w3.org/1999/xhtml">
			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
			
 
				 <meta charset="utf-8">
			
 
				 <head th:include="include :: header"></head>
			
 
				 <link href="/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css" th:href="@{/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css}" rel="stylesheet"/>
			
--- a/src/main/resources/templates/system/post/add.html
+++ b/src/main/resources/templates/system/post/add.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html xmlns:th="http://www.w3.org/1999/xhtml">
			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
			
 
				 <meta charset="utf-8">
			
 
				 <head th:include="include :: header"></head>
			
 
				 <body class="white-bg">
			
--- a/src/main/resources/templates/system/post/edit.html
+++ b/src/main/resources/templates/system/post/edit.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html xmlns:th="http://www.w3.org/1999/xhtml">
			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
			
 
				 <meta charset="utf-8">
			
 
				 <head th:include="include :: header"></head>
			
 
				 <body class="white-bg">
			
--- a/src/main/resources/templates/system/post/post.html
+++ b/src/main/resources/templates/system/post/post.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html lang="zh_CN" xmlns:th="http://www.thymeleaf.org"
			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org"
			
 
				 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
			
 
				 <meta charset="utf-8">
			
 
				 <head th:include="include :: header"></head>
			
--- a/src/main/resources/templates/system/role/add.html
+++ b/src/main/resources/templates/system/role/add.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>

			
 
				-<html xmlns:th="http://www.w3.org/1999/xhtml">

			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >

			
 
				 <meta charset="utf-8">

			
 
				 <head th:include="include :: header"></head>

			
 
				 <link href="/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css" th:href="@{/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css}" rel="stylesheet"/>

			
--- a/src/main/resources/templates/system/role/edit.html
+++ b/src/main/resources/templates/system/role/edit.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>

			
 
				-<html xmlns:th="http://www.w3.org/1999/xhtml">

			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >

			
 
				 <meta charset="utf-8">

			
 
				 <head th:include="include :: header"></head>

			
 
				 <link href="/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css" th:href="@{/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css}" rel="stylesheet"/>

			
--- a/src/main/resources/templates/system/role/role.html
+++ b/src/main/resources/templates/system/role/role.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>

			
 
				-<html lang="zh_CN" xmlns:th="http://www.thymeleaf.org"

			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org"

			
 
				 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">

			
 
				 <meta charset="utf-8">

			
 
				 <head th:include="include :: header"></head>

			
--- a/src/main/resources/templates/system/user/add.html
+++ b/src/main/resources/templates/system/user/add.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html xmlns:th="http://www.w3.org/1999/xhtml">
			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
			
 
				 <meta charset="utf-8">
			
 
				 <head th:include="include :: header"></head>
			
 
				 <link href="/ajax/libs/iCheck/custom.css" th:href="@{/ajax/libs/iCheck/custom.css}" rel="stylesheet"/>
			
--- a/src/main/resources/templates/system/user/edit.html
+++ b/src/main/resources/templates/system/user/edit.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>

			
 
				-<html xmlns:th="http://www.w3.org/1999/xhtml">

			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >

			
 
				 <meta charset="utf-8">

			
 
				 <head th:include="include :: header"></head>

			
 
				 <link href="/ajax/libs/iCheck/custom.css" th:href="@{/ajax/libs/iCheck/custom.css}" rel="stylesheet"/>

			
--- a/src/main/resources/templates/system/user/profile/avatar.html
+++ b/src/main/resources/templates/system/user/profile/avatar.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html xmlns:th="http://www.w3.org/1999/xhtml">
			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
			
 
				 <meta charset="utf-8">
			
 
				 <title>用户头像修改</title>
			
 
				 <link href="/ajax/libs/cropbox/cropbox.css" th:href="@{/ajax/libs/cropbox/cropbox.css}" rel="stylesheet"/>
			
--- a/src/main/resources/templates/system/user/profile/edit.html
+++ b/src/main/resources/templates/system/user/profile/edit.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html xmlns:th="http://www.w3.org/1999/xhtml">
			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
			
 
				 <meta charset="utf-8">
			
 
				 <head th:include="include :: header"></head>
			
 
				 <body class="white-bg">
			
--- a/src/main/resources/templates/system/user/profile/profile.html
+++ b/src/main/resources/templates/system/user/profile/profile.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html>
			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
			
 
				 <head>
			
 
				     <meta charset="utf-8">
			
 
				     <meta name="viewport" content="width=device-width, initial-scale=1.0">
			
--- a/src/main/resources/templates/system/user/profile/resetPwd.html
+++ b/src/main/resources/templates/system/user/profile/resetPwd.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html xmlns:th="http://www.w3.org/1999/xhtml">
			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
			
 
				 <meta charset="utf-8">
			
 
				 <head th:include="include :: header"></head>
			
 
				 <body class="white-bg">
			
--- a/src/main/resources/templates/system/user/resetPwd.html
+++ b/src/main/resources/templates/system/user/resetPwd.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html xmlns:th="http://www.w3.org/1999/xhtml">
			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
			
 
				 <meta charset="utf-8">
			
 
				 <head th:include="include :: header"></head>
			
 
				 <body class="white-bg">
			
--- a/src/main/resources/templates/system/user/user.html
+++ b/src/main/resources/templates/system/user/user.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>

			
 
				-<html lang="zh_CN" xmlns:th="http://www.thymeleaf.org"

			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org"

			
 
				 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">

			
 
				 <meta charset="utf-8">

			
 
				 <head th:include="include :: header"></head>

			
--- a/src/main/resources/templates/tool/build/build.html
+++ b/src/main/resources/templates/tool/build/build.html
@@ -1,6 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html lang="zh_CN" xmlns:th="http://www.thymeleaf.org"
			
 
				-	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
			
 
				 <meta charset="utf-8">
			
 
				 <head th:include="include :: header"></head>
			
 
				 <link href="/ajax/libs/iCheck/custom.css" th:href="@{/ajax/libs/iCheck/custom.css}" rel="stylesheet"/>
			
--- a/src/main/resources/templates/tool/gen/gen.html
+++ b/src/main/resources/templates/tool/gen/gen.html
@@ -1,6 +1,5 @@
 
				 <!DOCTYPE html>

			
 
				-<html lang="zh_CN" xmlns:th="http://www.thymeleaf.org"

			
 
				-	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">

			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">

			
 
				 <meta charset="utf-8">

			
 
				 <head th:include="include :: header"></head>

			
 
				 <body class="gray-bg">

			
--- a/src/main/resources/templates/vm/html/add.html.vm
+++ b/src/main/resources/templates/vm/html/add.html.vm
@@ -1,5 +1,5 @@
 
				-<!DOCTYPE html>

			
 
				-<html>

			
 
				+<!DOCTYPE HTML>

			
 
				+<html  lang="zh" xmlns:th="http://www.thymeleaf.org">

			
 
				 <meta charset="utf-8">

			
 
				 <head th:include="include :: header"></head>

			
 
				 <body class="white-bg">

			
--- a/src/main/resources/templates/vm/html/edit.html.vm
+++ b/src/main/resources/templates/vm/html/edit.html.vm
@@ -1,5 +1,5 @@
 
				-<!DOCTYPE html>

			
 
				-<html>

			
 
				+<!DOCTYPE HTML>

			
 
				+<html  lang="zh" xmlns:th="http://www.thymeleaf.org">

			
 
				 <meta charset="utf-8">

			
 
				 <head th:include="include :: header"></head>

			
 
				 <body class="white-bg">

			
--- a/src/main/resources/templates/vm/html/list.html.vm
+++ b/src/main/resources/templates/vm/html/list.html.vm
@@ -1,5 +1,5 @@
 
				-<!DOCTYPE html>
			
 
				-<html lang="zh_CN" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
			
 
				+<!DOCTYPE HTML>
			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
			
 
				 <meta charset="utf-8">
			
 
				 <head th:include="include :: header"></head>
			
 
				 <body class="gray-bg">