From a6f0596a6365b3ebdfd32af7fa2a740577aaef9d Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 10 Aug 2021 09:37:11 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfptweb-publicSecurity

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

diff --git a/src/styles/common.scss b/src/styles/common.scss
index a105984..ca8c7ed 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -22,6 +22,10 @@
 @import './distribution.scss';
 //实时警情弹窗
 @import './real.scss';
+
+//实时警情弹窗
+@import './new-style.scss';
+
 a{
   text-decoration: none;
   color:#333;
@@ -30,4 +34,4 @@
   outline: none;
 }
 //滚动条样式
-@include scrollBar;
\ No newline at end of file
+@include scrollBar;

--
Gitblit v1.9.3