From 33010a65c974cfca4693ad16d71a8c33482e6a47 Mon Sep 17 00:00:00 2001
From: "du.meimei" <du.meimei@ebiz-digits.com>
Date: Wed, 23 Apr 2025 10:56:37 +0800
Subject: [PATCH] Merge branch 'dev' into ui

# Conflicts:
#	src/assets/sass/utils.scss
---
 src/assets/sass/renderUi.scss | 2 +-
 src/assets/sass/utils.scss    | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/assets/sass/renderUi.scss b/src/assets/sass/renderUi.scss
index bc44fcd..8c385e8 100644
--- a/src/assets/sass/renderUi.scss
+++ b/src/assets/sass/renderUi.scss
@@ -11,6 +11,6 @@ body,
 }
 
 .container {
-  padding: 20px;
+  padding: 20px 10px;
   //background-image: url('../images/backimage.png');
 }
diff --git a/src/assets/sass/utils.scss b/src/assets/sass/utils.scss
index 59d5e68..aca2bc2 100644
--- a/src/assets/sass/utils.scss
+++ b/src/assets/sass/utils.scss
@@ -142,11 +142,6 @@ h3 {
   margin-bottom: 10px;
   text-align: right;
 }
-.container {
-  padding: 20px 20px 20px 10px;
-  //margin: 15px;
-  //background: #fff;
-}
 .el-select {
   width: 100%;
 }