From bc76c2de5632fe1433acd92dddc5842b99a06890 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Wed, 03 Nov 2021 20:22:05 +0800
Subject: [PATCH] 解决冲突
---
src/page/login/userlogin.vue | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue
index 377c748..50daff1 100644
--- a/src/page/login/userlogin.vue
+++ b/src/page/login/userlogin.vue
@@ -5,7 +5,8 @@
ref="loginForm"
:model="loginForm"
label-width="0">
- <el-form-item v-if="tenantMode" prop="tenantId">
+<!-- <el-form-item v-if="tenantMode" prop="tenantId">-->
+ <el-form-item v-if="false" prop="tenantId">
<el-input size="small"
@keyup.enter.native="handleLogin"
v-model="loginForm.tenantId"
--
Gitblit v1.9.3