From 60322c503d201e4d1000e62d8ecf17db4f628e4c Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 12 三月 2025 15:49:23 +0800
Subject: [PATCH] 合并冲突

---
 src/assets/styles/index.scss |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 87825e4..f5b99c0 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -196,3 +196,11 @@
 .required-span {
   color: red;
 }
+
+.bg-1 {
+  width: 100%;
+  min-height: calc(100vh - 90px);
+  overflow-y: auto;
+  // padding: 20px 10px 10px;
+  background: rgb(245, 247, 251);
+}

--
Gitblit v1.9.3