From fbab8f228bf82cadb043fbf3ed110b3db73924aa Mon Sep 17 00:00:00 2001 From: 20918 <2091823062@qq.com> Date: Thu, 30 May 2024 14:27:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=85=E5=A1=AB=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/system/check/edit.html | 32 +++++++------- .../templates/system/check/selfcheck.html | 24 +++++----- .../templates/system/checkresult/docheck.html | 26 +++++------ .../templates/system/filedestory/edit.html | 26 +++++------ .../templates/system/fileprovide/add.html | 8 ++-- .../templates/system/indenture/edit.html | 4 +- .../templates/system/leave/edit.html | 20 ++++----- .../templates/system/leave/leaveexamine.html | 16 +++---- .../templates/system/network/netinfo/add.html | 12 ++--- .../system/network/netinfo/edit.html | 42 ++++++++---------- .../templates/system/network/network/add.html | 14 +++--- .../system/network/network/edit.html | 26 +++++------ .../templates/system/notify/edit.html | 20 ++++----- .../system/property/property/add.html | 12 ++--- .../system/property/property/edit.html | 38 ++++++++-------- .../templates/system/question/add.html | 26 +++++------ .../templates/system/question/edit.html | 30 ++++++------- .../templates/system/train/edit.html | 30 ++++++------- .../templates/system/train/examine.html | 12 ++--- .../resources/templates/system/user/add.html | 8 ++-- .../resources/templates/system/user/edit.html | 44 +++++++++---------- .../resources/mapper/system/TdLeaveMapper.xml | 4 +- 22 files changed, 235 insertions(+), 239 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/system/check/edit.html b/ruoyi-admin/src/main/resources/templates/system/check/edit.html index fec868c..383e95e 100644 --- a/ruoyi-admin/src/main/resources/templates/system/check/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/check/edit.html @@ -30,51 +30,51 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/check/selfcheck.html b/ruoyi-admin/src/main/resources/templates/system/check/selfcheck.html index 2acaae5..1e8ca2d 100644 --- a/ruoyi-admin/src/main/resources/templates/system/check/selfcheck.html +++ b/ruoyi-admin/src/main/resources/templates/system/check/selfcheck.html @@ -30,10 +30,10 @@
- +
- +
@@ -45,10 +45,10 @@
- +
- +
@@ -60,10 +60,10 @@
- +
- +
@@ -75,10 +75,10 @@
- +
- +
@@ -90,10 +90,10 @@
- +
- +
@@ -105,10 +105,10 @@
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/checkresult/docheck.html b/ruoyi-admin/src/main/resources/templates/system/checkresult/docheck.html index 2a8b702..13e8adf 100644 --- a/ruoyi-admin/src/main/resources/templates/system/checkresult/docheck.html +++ b/ruoyi-admin/src/main/resources/templates/system/checkresult/docheck.html @@ -23,7 +23,7 @@
- +
@@ -31,7 +31,7 @@
- +
@@ -41,15 +41,15 @@
- +
- +
-
@@ -62,7 +62,7 @@
- +
@@ -73,7 +73,7 @@
- +
@@ -101,7 +101,7 @@
- +
@@ -130,7 +130,7 @@
- +
@@ -159,7 +159,7 @@
- +
@@ -188,7 +188,7 @@
- +
@@ -217,7 +217,7 @@
- +
@@ -246,7 +246,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/filedestory/edit.html b/ruoyi-admin/src/main/resources/templates/system/filedestory/edit.html index feade6e..fa40fd0 100644 --- a/ruoyi-admin/src/main/resources/templates/system/filedestory/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/filedestory/edit.html @@ -18,12 +18,6 @@
-
- -
- -
-
@@ -46,21 +40,27 @@
- +
- +
- +
- + +
+
+
+ +
+
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/fileprovide/add.html b/ruoyi-admin/src/main/resources/templates/system/fileprovide/add.html index 6eeeb77..dce45cf 100644 --- a/ruoyi-admin/src/main/resources/templates/system/fileprovide/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/fileprovide/add.html @@ -58,9 +58,9 @@
- +
-
@@ -72,9 +72,9 @@
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/indenture/edit.html b/ruoyi-admin/src/main/resources/templates/system/indenture/edit.html index 1071225..f9beb90 100644 --- a/ruoyi-admin/src/main/resources/templates/system/indenture/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/indenture/edit.html @@ -67,14 +67,14 @@
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/leave/edit.html b/ruoyi-admin/src/main/resources/templates/system/leave/edit.html index 62f2635..f8b0184 100644 --- a/ruoyi-admin/src/main/resources/templates/system/leave/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/leave/edit.html @@ -10,37 +10,37 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/leave/leaveexamine.html b/ruoyi-admin/src/main/resources/templates/system/leave/leaveexamine.html index a52cd11..907a469 100644 --- a/ruoyi-admin/src/main/resources/templates/system/leave/leaveexamine.html +++ b/ruoyi-admin/src/main/resources/templates/system/leave/leaveexamine.html @@ -22,9 +22,9 @@
- +
- @@ -35,17 +35,17 @@
- +
- +
- +
- @@ -56,9 +56,9 @@
- +
- diff --git a/ruoyi-admin/src/main/resources/templates/system/network/netinfo/add.html b/ruoyi-admin/src/main/resources/templates/system/network/netinfo/add.html index 5aa1a8e..be217b7 100644 --- a/ruoyi-admin/src/main/resources/templates/system/network/netinfo/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/network/netinfo/add.html @@ -47,15 +47,15 @@
- +
- +
- +
- +
@@ -67,9 +67,9 @@
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/network/netinfo/edit.html b/ruoyi-admin/src/main/resources/templates/system/network/netinfo/edit.html index 91160c8..6837276 100644 --- a/ruoyi-admin/src/main/resources/templates/system/network/netinfo/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/network/netinfo/edit.html @@ -20,17 +20,17 @@
- +
-
- +
- +
@@ -40,54 +40,48 @@
- +
- +
- +
- +
- - - - - -
- +
- +
- +
- +
- +
-
- +
- +
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/network/network/add.html b/ruoyi-admin/src/main/resources/templates/system/network/network/add.html index 550df55..9fedc36 100644 --- a/ruoyi-admin/src/main/resources/templates/system/network/network/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/network/network/add.html @@ -20,28 +20,28 @@
- +
- +
- +
- +
- +
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/network/network/edit.html b/ruoyi-admin/src/main/resources/templates/system/network/network/edit.html index f634122..0aa9f56 100644 --- a/ruoyi-admin/src/main/resources/templates/system/network/network/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/network/network/edit.html @@ -9,31 +9,31 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -48,17 +48,17 @@
- +
-
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/notify/edit.html b/ruoyi-admin/src/main/resources/templates/system/notify/edit.html index f6839f4..f216745 100644 --- a/ruoyi-admin/src/main/resources/templates/system/notify/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/notify/edit.html @@ -9,15 +9,15 @@
- +
- +
- +
- +
@@ -42,21 +42,21 @@
- +
- +
- +
- +
- +
-
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/property/add.html b/ruoyi-admin/src/main/resources/templates/system/property/property/add.html index df2efb5..618c37a 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/property/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/property/add.html @@ -26,9 +26,9 @@
- +
- +
@@ -38,10 +38,10 @@
- +
- +
@@ -59,10 +59,10 @@
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html b/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html index 2192187..b3443fd 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html @@ -9,75 +9,75 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/question/add.html b/ruoyi-admin/src/main/resources/templates/system/question/add.html index 89d572d..7f0b0cb 100644 --- a/ruoyi-admin/src/main/resources/templates/system/question/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/question/add.html @@ -8,7 +8,7 @@
- +
+
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/question/edit.html b/ruoyi-admin/src/main/resources/templates/system/question/edit.html index 600c253..4a300a2 100644 --- a/ruoyi-admin/src/main/resources/templates/system/question/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/question/edit.html @@ -9,47 +9,47 @@
- +
-
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -62,7 +62,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/train/edit.html b/ruoyi-admin/src/main/resources/templates/system/train/edit.html index 4220e54..319cdbc 100644 --- a/ruoyi-admin/src/main/resources/templates/system/train/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/train/edit.html @@ -20,9 +20,9 @@
- +
-
- +
- +
- +
- +
- +
-
- +
-
- +
- +
- +
@@ -75,9 +75,9 @@
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/train/examine.html b/ruoyi-admin/src/main/resources/templates/system/train/examine.html index 0c9d110..2b88db8 100644 --- a/ruoyi-admin/src/main/resources/templates/system/train/examine.html +++ b/ruoyi-admin/src/main/resources/templates/system/train/examine.html @@ -72,24 +72,24 @@
- +
-
- +
- +
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/add.html b/ruoyi-admin/src/main/resources/templates/system/user/add.html index 088132a..34a669a 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/add.html @@ -34,10 +34,10 @@
- +
- +
@@ -45,10 +45,10 @@
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/edit.html b/ruoyi-admin/src/main/resources/templates/system/user/edit.html index 0516d7f..69eea32 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/edit.html @@ -22,10 +22,10 @@
- +
- +
@@ -35,10 +35,10 @@
- +
- +
@@ -46,10 +46,10 @@
- +
- +
@@ -61,7 +61,7 @@
- +
@@ -70,9 +70,9 @@
- +
-
@@ -80,9 +80,9 @@
- +
-
@@ -92,9 +92,9 @@
- +
-
@@ -104,7 +104,7 @@
- +
@@ -112,17 +112,17 @@
- +
- +
- +
-
@@ -132,10 +132,10 @@
- +
- +
@@ -155,9 +155,9 @@
- +
-
diff --git a/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml index 077fef0..00d0e0d 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml @@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, user_id, user_name, country, areaname, leavereason, depart, leavedate, workstate, leavestate, examinename, examinedate, examinestate from td_leave ORDER BY examinedate ASC + select id, user_id, user_name, country, areaname, leavereason, depart, leavedate, workstate, leavestate, examinename, examinedate, examinestate from td_leave