Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/assets/styles/sidebar.scss

@@ -34,6 +34,8 @@
 
     .scrollbar-wrapper {
       overflow-x: hidden !important;
+      padding-bottom: 50px !important;
+      box-sizing: border-box;
     }
 
     .el-scrollbar__bar.is-vertical {