From 5ecc0db092077b300fa2e25f2f88cce0479b6d50 Mon Sep 17 00:00:00 2001 From: wangxy <1356089412@qq.com> Date: Tue, 9 Jul 2024 17:04:41 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/system/user/add.html | 84 ++++++++++++------- .../resources/templates/system/user/edit.html | 52 ++++++++++++ .../common/core/domain/entity/SysUser.java | 2 - 3 files changed, 106 insertions(+), 32 deletions(-) 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 d8d80c0..3f54db6 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/add.html @@ -4,6 +4,7 @@ +
@@ -214,17 +215,6 @@
-
-
-
- -
- - -
-
-
-
@@ -243,6 +233,27 @@
+
+
+ +
+
+ + 选择文件 + 更改 + + + + + + × +
+
+
+ + + +

其他信息

@@ -266,8 +277,7 @@ - - + - + 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 d0497ae..102ee59 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/edit.html @@ -4,6 +4,7 @@ +
@@ -200,6 +201,25 @@
+
+
+ +
+
+ + 选择文件 + 更改 + + + + + [[*{confName}]] + × +
+
+
+ +

其他信息

@@ -222,6 +242,7 @@ + diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index af83512..bc37e8e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -223,11 +223,9 @@ public class SysUser extends BaseEntity private String havePassport; /** 保密协议书 */ - @Excel(name = "保密协议书") private String confAgreement; /** 保密协议书文件名 */ - @Excel(name = "保密协议书文件名") private String confName; public String getConfName() {