Merge remote-tracking branch 'origin/build' into union

# Conflicts: # .npmrc
2022-11-30 10:22:42 +08:00
parent 8bf6c57668 7f4607c3ba
commit 4ab84b7766
13 changed files with 2754 additions and 10 deletions
--- a/vue.config.js
+++ b/vue.config.js
@@ -57,7 +57,7 @@ module.exports = {
    proxy: {
      //设置代理,可解决跨5
      '/lan': {
-        target: 'http://dvcp.sinoecare.net',
+        target: 'http://192.168.1.87:9000',
        changeOrigin: true,
        pathRewrite: {
          //地址重写