From 4e598bff548c0e4a89f30e1523bdfb8b59d97741 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 30 一月 2026 09:59:05 +0800
Subject: [PATCH] tijiao
---
admin/src/views/login.vue | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/admin/src/views/login.vue b/admin/src/views/login.vue
index 5c64f46..a4f240a 100644
--- a/admin/src/views/login.vue
+++ b/admin/src/views/login.vue
@@ -3,8 +3,13 @@
<img src="@/assets/images/bg@2x.png" class="main_bg" alt="">
<div class="login_wrap">
<div class="login_img">
+<<<<<<< HEAD
<div class="h3" style="font-size: 30px; margin-bottom: 0;">{{sysConfig.title || ''}}</div>
<div class="h3">{{sysConfig.subtitle || title}}</div>
+=======
+ <div class="h2">鑺滄箹鐑熻崏鏅烘収瀹夋秷瀹夊叏闃茶寖绯荤粺</div>
+ <div class="h3">鏅烘収鐗╂祦鍥尯瀹夋秷涓�浣撳寲绯荤粺</div>
+>>>>>>> c5675caa (鏈�鏂扮増鏈�541200007)
</div>
<div class="form_wrap">
<div class="tabs">
--
Gitblit v1.9.3