From 0ee006792256a1089467b7f54e0eb5061c1afa12 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 03 三月 2026 16:21:49 +0800
Subject: [PATCH] 经销商管理

---
 mini-program/main.js |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mini-program/main.js b/mini-program/main.js
index cf97271..4b87150 100644
--- a/mini-program/main.js
+++ b/mini-program/main.js
@@ -8,10 +8,10 @@
 App.mpType = 'app'
 
 Vue.prototype.$store = store;
-<<<<<<< HEAD
+
+
 // Vue.prototype.$baseUrl = 'http://192.168.1.17:12015/'
-=======
->>>>>>> 8fd09daba5c89106b4a9aacd8d5ef9354afc93be
+// Vue.prototype.$baseUrl = 'http://192.168.1.85:12015/'
 Vue.prototype.$baseUrl = 'http://192.168.0.7/dmmall_web_api/'
 // Vue.prototype.$baseUrl = 'https://test.doumee.cn/dmmall_web_api/'
 

--
Gitblit v1.9.3