From ab7ca3fc04bf4f1f6e2cfb2c02d1cc61368d3d16 Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Sun, 12 Jan 2025 21:59:44 +0800
Subject: [PATCH] 1

---
 .env.development | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/.env.development b/.env.development
index ac98190..e1223e0 100644
--- a/.env.development
+++ b/.env.development
@@ -8,24 +8,16 @@ VITE_OPEN = true
 ENV = 'development'
 
 # ADMIN 服务地址
-# VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 线上
+VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 线上
 # VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/
 # VITE_ADMIN_PROXY_PATH = http://localhost:9999/
-<<<<<<< HEAD
 # VITE_ADMIN_PROXY_PATH = http://192.168.101.29:9999/ # 邓-本地
-=======
-VITE_ADMIN_PROXY_PATH = http://192.168.101.29:9999/ # 邓-本地
->>>>>>> biz-pc-cloud/master
 
 # 图片访问基础地址
-# VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api # 线上
+VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api # 线上
 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc
 # VITE_IMAGE_BASE_PATH = http://localhost:9999
-<<<<<<< HEAD
 # VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地
-=======
-VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地
->>>>>>> biz-pc-cloud/master
 
 # 代码生成服务地址
 VITE_GEN_PROXY_PATH = http://192.168.110.156:5003