From 451674dd4dd784fa0725b4ba052d94449d892712 Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Sat, 28 Sep 2024 15:12:16 +0800
Subject: [PATCH] Merge branch '6-29印度股票' of http://124.156.157.155:8060/r/dg/dabao_admin into 6-29印度股票

---
 .env.development |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.env.development b/.env.development
index f28da8f..ed8675a 100644
--- a/.env.development
+++ b/.env.development
@@ -1,10 +1,16 @@
 NODE_ENV=development
 VUE_APP_PREVIEW=true
 # VUE_APP_API_BASE_URL=http://www.jqydl.com:8091/
-#  VUE_APP_API_BASE_URL=https://api.3falcon.com/
-#  VUE_APP_API_BASE_URL=https://api.marwadi.online/
+# VUE_APP_API_BASE_URL=https://api.3falcon.com/
+# VUE_APP_API_BASE_URL=https://api.marwadi.online/
 # VUE_APP_API_BASE_URL=https://www.rksv.store:8091/
-# VUE_APP_API_BASE_URL=http://www.ojwuf.com:8091/
-VUE_APP_API_BASE_URL=http://192.168.0.110:8091/
+# VUE_APP_API_BASE_URL=https://api.dfddgj346.xyz/
+<<<<<<< HEAD
+VUE_APP_API_BASE_URL=http://192.168.10.7:8091/
+# VUE_APP_API_BASE_URL=https://api.ambaracapital.net/
+=======
+# VUE_APP_API_BASE_URL=http://192.168.10.5:8091/
+VUE_APP_API_BASE_URL=https://api.pentagon-member.com/
+>>>>>>> 7bea4880ad378d6a0ffef45f2bb15f92f7b80bd0
 # VUE_APP_API_BASE_URL= https://www.prudentcapitals.net/
 # VUE_APP_API_BASE_URL=https://api.guosen.org/
\ No newline at end of file

--
Gitblit v1.9.3