From c19e349f8c93ff63b56fa550ab38d68d67c6905b Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Wed, 14 Aug 2024 11:29:49 +0800
Subject: [PATCH] 合并冲突
---
gz-customerSystem/src/api/appUrl.js | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/gz-customerSystem/src/api/appUrl.js b/gz-customerSystem/src/api/appUrl.js
index 1355cd3..ec7d9cb 100644
--- a/gz-customerSystem/src/api/appUrl.js
+++ b/gz-customerSystem/src/api/appUrl.js
@@ -2,20 +2,20 @@
* @Company: hugeInfo
* @Author: ldh
* @Date: 2022-02-16 11:25:57
- * @LastEditTime: 2024-08-12 09:26:56
+ * @LastEditTime: 2024-08-13 14:17:29
* @LastEditors: dminyi 1301963064@qq.com
* @Version: 1.0.0
* @Description: api地址
*/
export const debug = {
// web服务
- baseUrl: 'http://gz.hugeinfo.com.cn',
- // baseUrl: 'http://192.168.3.108:9002',
+ // baseUrl: 'http://gz.hugeinfo.com.cn',
+ baseUrl: 'http://192.168.3.108:9002',
// baseUrl: 'http://mdqgnh.natappfree.cc',
// 附件服务
- // fileUrl: 'http://192.168.3.108:9002',
- fileUrl: 'http://gz.hugeinfo.com.cn',
+ fileUrl: 'http://192.168.3.108:9002',
+ // fileUrl: 'http://gz.hugeinfo.com.cn',
// 文件查看url 后面接附件编号
--
Gitblit v1.8.0