Merge remote-tracking branch 'origin/dev' into dev

疯狂的狮子li

2021-06-10 b348b766fc4cd9079d1bee1fed32fc21bfe01436

 ruoyi-ui/vue.config.js

@@ -34,7 +34,7 @@
    proxy: {
      // detail: https://cli.vuejs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
        target: `http://localhost:8080`,
        target: `http://localhost:8081`,
        changeOrigin: true,
        pathRewrite: {
          ['^' + process.env.VUE_APP_BASE_API]: ''