Merge branch 'dev' into ui

# Conflicts:
#	src/assets/sass/utils.scss
This commit is contained in:
du.meimei
2025-04-23 10:56:37 +08:00
parent ba8a29e0be
commit 33010a65c9
2 changed files with 1 additions and 6 deletions

View File

@@ -11,6 +11,6 @@ body,
} }
.container { .container {
padding: 20px; padding: 20px 10px;
//background-image: url('../images/backimage.png'); //background-image: url('../images/backimage.png');
} }

View File

@@ -142,11 +142,6 @@ h3 {
margin-bottom: 10px; margin-bottom: 10px;
text-align: right; text-align: right;
} }
.container {
padding: 20px 20px 20px 10px;
//margin: 15px;
//background: #fff;
}
.el-select { .el-select {
width: 100%; width: 100%;
} }