From 5e8f70caf25beb34657f34a7ee06e1e1ff541cdb Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期六, 28 二月 2026 16:27:54 +0800
Subject: [PATCH] 合并

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

diff --git a/mini-program/main.js b/mini-program/main.js
index cf97271..333139c 100644
--- a/mini-program/main.js
+++ b/mini-program/main.js
@@ -8,10 +8,7 @@
 App.mpType = 'app'
 
 Vue.prototype.$store = store;
-<<<<<<< HEAD
 // Vue.prototype.$baseUrl = 'http://192.168.1.17:12015/'
-=======
->>>>>>> 8fd09daba5c89106b4a9aacd8d5ef9354afc93be
 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