From 52e18000ace434b2acdebce5e118c45c337a3fe7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 28 五月 2024 13:31:54 +0800
Subject: [PATCH] 合并冲突

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

diff --git a/vue.config.js b/vue.config.js
index 6296cca..e4cad29 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -6,8 +6,8 @@
 
 
 
-const url = 'https://ztms-mes.chinaztt.cn/'
-// const url = 'http://localhost:9999'
+// const url = 'https://ztms-mes.ztt.cn/'
+const url = 'http://localhost:9999'
 //const url = 'http://192.168.32.45:9999'
 
 

--
Gitblit v1.9.3