From 9b178c3f200efa15fbfee7aa67d09177bca84d47 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Fri, 28 Mar 2025 17:09:43 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard

---
 src/styles/common.scss |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/styles/common.scss b/src/styles/common.scss
index 11cce9c..bed1aad 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -1,7 +1,8 @@
+//样式重置
+@use './reset.scss';
 // 全局变量
 @use './variables.scss' as variables;
 @use './mixin.scss' as *;
-
 // ele样式覆盖
 @use './element-ui.scss';
 // 顶部右侧显示
@@ -22,6 +23,8 @@
 @use "./login.scss";
 //适配
 @use './media.scss';
+//字体
+@use './font.scss';
 //滚动条样式
 @include scrollBar;
 

--
Gitblit v1.9.3