Merge remote-tracking branch 'origin/master'

jiangping

2024-01-05 cb6874174975a370cb60f1557704c9d49a05f9e6

 admin/src/layouts/AppLayout.vue

@@ -38,7 +38,7 @@
  overflow: hidden;
  // 左边菜单
  .el-aside {
    width: $menu-width !important;
    width: 250px !important;
    flex-shrink: 0;
    height: 100%;
    overflow-y: auto;