Merge remote-tracking branch 'origin/master'

futian.liu

2023-12-12 2096ac6f7379d75001b610c2de1fa380abd09519

 admin-web/src/styles/styles.scss

@@ -128,7 +128,6 @@

.divBox {
  padding: 20px;
  // padding: 0 20px 20px;
  box-sizing: border-box;
  .el-pagination {
    display: flex;