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.preview |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/.env.preview b/.env.preview
index 0d6b42b..e835a87 100644
--- a/.env.preview
+++ b/.env.preview
@@ -1,3 +1,13 @@
 NODE_ENV=production
+
 VUE_APP_PREVIEW=true
-VUE_APP_API_BASE_URL=/
\ No newline at end of file
+
+<<<<<<< HEAD
+# VUE_APP_API_BASE_URL=https://api.ambaracapital.net/
+
+VUE_APP_API_BASE_URL=http://192.168.10.7:8091/
+=======
+VUE_APP_API_BASE_URL=https://api.pentagon-member.com/
+
+# VUE_APP_API_BASE_URL=http://192.168.10.5:8091/
+>>>>>>> 7bea4880ad378d6a0ffef45f2bb15f92f7b80bd0

--
Gitblit v1.9.3