From 6e85937b4ed360b6ba0451128c4a90b325c38e7a Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 27 Aug 2021 09:27:09 +0800
Subject: [PATCH] 冲突
---
src/views/system/user.vue | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index ccfbd2a..1a726da 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -220,7 +220,8 @@
}
};
return {
- form: {},
+ form: {
+ },
search: {},
roleBox: false,
excelBox: false,
@@ -414,6 +415,7 @@
{
label: "密码",
prop: "password",
+ type:'password',
hide: true,
editDisplay: false,
viewDisplay: false,
@@ -424,6 +426,7 @@
{
label: "确认密码",
prop: "password2",
+ type:'password',
hide: true,
editDisplay: false,
viewDisplay: false,
--
Gitblit v1.9.3