From 2b99047683332624832c1dfcae596e957a710b7d Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期四, 28 七月 2022 10:20:49 +0800
Subject: [PATCH] bug修复

---
 vue.config.js |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/vue.config.js b/vue.config.js
index e533757..ef308c3 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -14,8 +14,13 @@
     proxy: {
       "/api": {
         // target: "http://192.168.20.10:7004",
+<<<<<<< HEAD
         // target: "http://192.168.20.174:7070",
         target: "http://192.168.20.115:7070",
+=======
+        target: "http://192.168.20.115:7070",
+        // target: "http://192.168.20.235:7070",
+>>>>>>> bug淇
         //  target: "http://192.168.20.117:7080",
         // secure: false,
         changeOrigin: true,
@@ -26,6 +31,10 @@
         // target: "http://222.128.87.51:7003",
         // target: "http://192.168.20.10:7009",
         // target: "http://192.168.20.189:7009",
+<<<<<<< HEAD
+=======
+        // target: "http://192.168.20.235:7070",
+>>>>>>> bug淇
         target: "http://192.168.20.115:7070",
 
         changeOrigin: true, //寮�鍚唬鐞�

--
Gitblit v1.8.0