Merge branch 'develop' into feature/项目管理

# Conflicts:
#	src/vab/components/VabQueryForm/index.vue

src/config/theme.config.js

@@ -15,7 +15,7 @@ module.exports = {
   // 是否开启顶部进度条
   showProgressBar: true,
   // 是否开启标签页
-  showTabs: true,
+  showTabs: false,
   // 显示标签页时标签页样式：卡片风格card、灵动风格smart、圆滑风格smooth
   tabsBarStyle: 'smooth',
   // 是否标签页图标

src/vab/components/VabQueryForm/index.vue

@@ -30,11 +30,9 @@
         // margin: 0 0 $base-margin/2 0 !important;
         margin: 0 $base-margin/2 $base-margin/2 0 !important;
       }
-
       .el-form-item + .el-form-item {
         // margin: 0 0 $base-margin/2 0 !important;
         margin: 0 $base-margin/2 $base-margin/2 0 !important;
-
         .el-button {
           margin: 0 0 0 10px !important;
         }