From 88078aa63c669cffc2d91e1269d460436427d09d Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期四, 28 七月 2022 10:21:01 +0800
Subject: [PATCH] gb18186

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

diff --git a/vue.config.js b/vue.config.js
index ef308c3..9968aaa 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -13,11 +13,15 @@
     // hotOnly: false, // 鐑洿鏂�
     proxy: {
       "/api": {
+<<<<<<< HEAD
         // 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.10:7009",
+>>>>>>> gb18186
         target: "http://192.168.20.115:7070",
         // target: "http://192.168.20.235:7070",
 >>>>>>> bug淇

--
Gitblit v1.8.0