Merge remote-tracking branch 'origin/master'

jiangping

2024-12-10 eb275c6d06d3c27fd30bbf4975d27c93d7f56eb2

 admin/src/layouts/AppLayout.vue

@@ -68,8 +68,8 @@
    height: calc(100vh - 80px);
    overflow-y: scroll;
    overflow-x: hidden;
    background: $primary-color;
    color: #fff;
    background: #fff;
    color: #333333;
    transition: width ease .3s;
    scrollbar-width: none; /* firefox */
    -ms-overflow-style: none; /* IE 10+ */