From 17bed3a7f7e90b23afb5def223fd7a285ff6cc24 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 10 Aug 2021 08:40:56 +0800
Subject: [PATCH] 冲突
---
src/views/system/user.vue | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index ad554a6..7f43053 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -388,11 +388,13 @@
label: "所属客户",
prop: "tenantId",
type: "tree",
+ display:false,
dicUrl: "/api/blade-system/tenant/select",
props: {
label: "tenantName",
value: "tenantId",
},
+ value:"000000",
hide: !website.tenantMode,
addDisplay: website.tenantMode,
editDisplay: website.tenantMode,
@@ -610,6 +612,7 @@
label: "所属岗位",
prop: "postId",
type: "tree",
+ display: false,
multiple: true,
dicData: [],
props: {
--
Gitblit v1.9.3