From f4ed5ae8873f65c36b5cf37be264f6ec1e154647 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期三, 20 三月 2024 19:36:58 +0800
Subject: [PATCH] 合并分支冲突解决

---
 src/assets/style/variable.scss |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/assets/style/variable.scss b/src/assets/style/variable.scss
index 3f1ad83..af239e6 100644
--- a/src/assets/style/variable.scss
+++ b/src/assets/style/variable.scss
@@ -20,4 +20,4 @@
 $color-border-4: #f2f6fc;
 
 // 鑳屾櫙
-$color-bg: #f8f8f9;
+$color-bg: #E6ECF2;

--
Gitblit v1.8.0