Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/router/routes/index.ts

src/layouts/default/header/components/UpgradePrompt.vue

@@ -36,19 +36,19 @@
     },
     {
       payload: {
-        key: 2,
+        key: 4,
       },
       value: '数仓开发',
     },
     {
       payload: {
-        key: 3,
+        key: 2,
       },
       value: '数据治理',
     },
     {
       payload: {
-        key: 4,
+        key: 3,
       },
       value: '数据服务',
     },

src/router/routes/index.ts

@@ -821,15 +821,6 @@ export const sqlExecuteRoute: AppRouteRecordRaw = {
     currentActiveMenu: '/scriptDevelopment',
   },
   children: [
-    // {
-    //   path: 'sqlDevelopment/index',
-    //   name: 'index',
-    //   component: () => import('@/views/scriptDevelopment/sqlDevelopment/index_old.vue'),
-    //   meta: {
-    //     title: 'Sql开发',
-    //     icon: '',
-    //   },
-    // },
     {
       path: 'sqlDevelopment/sqlExecute/sqlExecute',
       name: 'SqlExecute',