From ea1a8cf41c11f8f533cea594e1f1c03640cf4a96 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 29 四月 2024 16:26:28 +0800
Subject: [PATCH] 合并冲突

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

diff --git a/vue.config.js b/vue.config.js
index 3b58a3e..4276ead 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -6,7 +6,7 @@
 
 
 // const url = 'https://ztms-mes.chinaztt.cn/'
- const url = 'http://localhost:9999'
+  const url = 'http://localhost:9999'
 //const url = 'http://192.168.32.45:9999'
 
 

--
Gitblit v1.9.3