From ac235850a9287dae6977c964213176fa7c86b140 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期四, 09 十二月 2021 14:42:20 +0800
Subject: [PATCH] Merge branch 'refactor/separate-vue' of ssh://192.168.0.10:29418/pcalife/PAM into refactor/separate-vue

---
 PAMapp/assets/scss/main.scss |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/PAMapp/assets/scss/main.scss b/PAMapp/assets/scss/main.scss
index fd9e92b..ae69a6e 100644
--- a/PAMapp/assets/scss/main.scss
+++ b/PAMapp/assets/scss/main.scss
@@ -1,4 +1,8 @@
 
-@import '_mixin.scss';
+@import './reset/reset';
 @import '_variable.scss';
-@import '_common.scss';
\ No newline at end of file
+@import '~/assets/icon/style.css';
+@import '_mixin.scss';
+@import './utilities/utilities';
+@import './vendors/elementUI';
+@import '_common.scss';

--
Gitblit v1.8.0