Merge remote-tracking branch 'origin/master'

jiangping

2024-06-03 e7b6e88a424a751ac657e150f52d72f1173321c9

 admin/vue.config.js

@@ -12,15 +12,16 @@
  lintOnSave: false,
  devServer: {
    host: '0.0.0.0',
    port: 10012
  /*  proxy: {
    port: 10012,
    proxy: {
      [process.env.VUE_APP_API_PREFIX]: {
        target: process.env.VUE_APP_API_URL,
        changeOrigin: true,
        pathRewrite: {
          [`^${[process.env.VUE_APP_API_PREFIX]}`]: ''
        }
      } */
      }
    }
  },
  configureWebpack: {
    resolve: {