Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/wechat-mp

# Conflicts:
#	yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/DefaultDatabaseQueryTest.java

Author: YunaiV

src/styles/index.scss

@@ -129,7 +129,7 @@ input, textarea{
 }
 
 .el-scrollbar__view{
-  overflow-x: hidden;
+//   overflow-x: hidden;
 }
 
 .el-rate{