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 |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/vue.config.js b/vue.config.js
index 545c796..e4cad29 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,3 +1,4 @@
+
 /**
  * 閰嶇疆鍙傝��:
  * https://cli.vuejs.org/zh/config/
@@ -5,7 +6,7 @@
 
 
 
-// const url = 'https://ztms-mes.chinaztt.cn/'
+// const url = 'https://ztms-mes.ztt.cn/'
 const url = 'http://localhost:9999'
 //const url = 'http://192.168.32.45:9999'
 

--
Gitblit v1.9.3