From 36990e3fc35d1dcf341895b65cba19a0d805f258 Mon Sep 17 00:00:00 2001
From: ustcyc <yincun@163.com>
Date: 星期三, 16 四月 2025 20:13:00 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/zhitan-cloud/zhitan-ems
---
zhitan-vue/src/views/login.vue | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/zhitan-vue/src/views/login.vue b/zhitan-vue/src/views/login.vue
index c99007b..a42fc6f 100644
--- a/zhitan-vue/src/views/login.vue
+++ b/zhitan-vue/src/views/login.vue
@@ -201,11 +201,7 @@
.login {
display: flex;
align-items: center;
-<<<<<<< HEAD
height: 100vh;
-=======
- height: 100%;
->>>>>>> bf185c5d6a86eaa6a27d93b6d5942234d5bebb24
background-image: url("@/assets/images/login-background.png");
background-repeat: no-repeat;
background-size: cover;
--
Gitblit v1.9.3