Merge remote-tracking branch 'origin/master'

jiangping

2025-04-17 a9f311e3c80bf4fa4f49936dccf4d919407ec3b4

 admin/src/layouts/AppLayout.vue

@@ -58,13 +58,14 @@
    display: flex;
    flex-direction: column;
    overflow: hidden;
    overflow-y: hidden !important;
    & > header {
      height: $header-height;
      flex-shrink: 0;
    }
    & > main {
      height: 100%;
      overflow-y: auto;
    /*  overflow-y: auto;*/
    }
  }
}