From 8327c022fc0dbd6f094a7bb5f67437ab7ec85d57 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 21 九月 2023 14:05:51 +0800
Subject: [PATCH] 属性对比

---
 company_admin/.env.development |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/company_admin/.env.development b/company_admin/.env.development
index f27a4ff..02e8212 100644
--- a/company_admin/.env.development
+++ b/company_admin/.env.development
@@ -3,8 +3,12 @@
 
 # VUE_APP_API = 'https://dmtest.ahapp.net/preselect_interface/'
 
+<<<<<<< HEAD
 VUE_APP_API = 'http://192.168.0.35:10022/'
+=======
+# VUE_APP_API = 'http://192.168.0.15:10024/'
+>>>>>>> 3fbfdefe98e5d35e32d74138ce73a1b4e2fe5465
 
-# VUE_APP_API = 'https://dmtest.ahapp.net/preselect_web_interface/'
+VUE_APP_API = 'https://dmtest.ahapp.net/preselect_web_interface/'
 
 # VUE_APP_API = 'https://dmtest.ahapp.net/preselect_interface/'
\ No newline at end of file

--
Gitblit v1.9.3