[完善]完善proxy

1 year ago · 31e2f43cfb
1 changed files with 0 additions and 3 deletions
--- a/proxy.config.json
+++ b/proxy.config.json
@ -1,11 +1,8 @@
 {
  "/api": {
    "target": "https://121.36.37.70:8204/",
-<<<<<<< HEAD
    "测试": "https://121.36.37.70:8204/",
    "生产": "https://fx.anxincloud.cn/",
-=======
->>>>>>> 1af64195fbad28ee962a81913395cde18a4de404
    "secure": false,
    "changeOrigin": true
  },