From 49bb5b44654b325d5da87cd6491cb8f93f6121aa Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Thu, 15 Aug 2024 18:13:27 +0800
Subject: [PATCH] 合并冲突
---
gz-customerSystem/src/api/appUrl.js | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/gz-customerSystem/src/api/appUrl.js b/gz-customerSystem/src/api/appUrl.js
index e5e00bf..cc05266 100644
--- a/gz-customerSystem/src/api/appUrl.js
+++ b/gz-customerSystem/src/api/appUrl.js
@@ -2,19 +2,21 @@
* @Company: hugeInfo
* @Author: ldh
* @Date: 2022-02-16 11:25:57
- * @LastEditTime: 2024-08-09 14:57:35
+ * @LastEditTime: 2024-08-15 14:23:32
* @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://192.168.3.108:9002',
+ fileUrl: 'http://gz.hugeinfo.com.cn',
+
// 文件查看url 后面接附件编号
fileShowUrl: '/dyh-sys/api/v1/fileInfo/show/',
--
Gitblit v1.8.0