From bd25d9a8a058e8c618ee4188ed5f15a898c0f7e8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 27 一月 2024 11:43:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/platform/.env.development b/platform/.env.development
index c1a5ac8..efa685a 100644
--- a/platform/.env.development
+++ b/platform/.env.development
@@ -1,6 +1,9 @@
 # 寮�鍙戠幆澧冮厤缃�
 NODE_ENV = 'development'
 
+<<<<<<< HEAD
+VUE_APP_API = 'http://192.168.0.134:10025/'
+=======
 VUE_APP_CONTEXT_PATH = '/'
 VUE_APP_API_PREFIX = '/api'
 
@@ -13,3 +16,4 @@
 
 # #娴嬭瘯鏈嶅姟鍣�
 #VUE_APP_API = 'https://dmtest.ahapp.net/preselect_admin_interface'
+>>>>>>> c6c95a49be6194989c124b8fd316fb5d434bd153

--
Gitblit v1.9.3