Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop

# Conflicts:
#	vue.config.js

vue.config.js

@@ -6,7 +6,8 @@
  * @FilePath: /fe-manage/vue.config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
-const {defineConfig} = require("@vue/cli-service");
+const { defineConfig } = require("@vue/cli-service");
+
 module.exports = defineConfig({
     lintOnSave: false,
     publicPath: process.env.VUE_APP_BASE,
@@ -40,7 +41,6 @@ module.exports = defineConfig({
                     // "^/manageApi": "",
                 },
             },
-            
         },
     },
 });