Merge remote-tracking branch 'origin/master'

k94314517

2023-12-21 9656636c8d7d665df694cae54d296d942f40c9f8

 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;