From 3dd3abbc68a1dd587021e205d3bebf4bff3eab46 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 29 一月 2024 17:44:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 platform/.env.development |   16 +---------------
 1 files changed, 1 insertions(+), 15 deletions(-)

diff --git a/platform/.env.development b/platform/.env.development
index efa685a..afef89d 100644
--- a/platform/.env.development
+++ b/platform/.env.development
@@ -1,19 +1,5 @@
 # 寮�鍙戠幆澧冮厤缃�
 NODE_ENV = 'development'
 
-<<<<<<< HEAD
-VUE_APP_API = 'http://192.168.0.134:10025/'
-=======
-VUE_APP_CONTEXT_PATH = '/'
-VUE_APP_API_PREFIX = '/api'
-
 # 浠诲悍
-# VUE_APP_API = 'http://192.168.0.15:10017/'
-# 鐒︽澗
-#VUE_APP_API = 'http://192.168.0.36:10023'
-# 姹熻悕
-VUE_APP_API = 'http://192.168.0.154:10023'
-
-# #娴嬭瘯鏈嶅姟鍣�
-#VUE_APP_API = 'https://dmtest.ahapp.net/preselect_admin_interface'
->>>>>>> c6c95a49be6194989c124b8fd316fb5d434bd153
+VUE_APP_API = 'http://192.168.0.134:10025/'

--
Gitblit v1.9.3