Merge remote-tracking branch 'origin/master'

k94314517

2024-10-09 8f2ad5eb040a2f3f1cae62a9c099c8f5f66750e1

 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+ */