Merge remote-tracking branch 'origin/master'

nidapeng

2024-03-08 41c983292fdd3a4291245940cecb462b839a9e62

 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;