From 2193f1e8240e2a0ed5900dddc6347a1d9db081cf Mon Sep 17 00:00:00 2001 From: jiaosong <jiaosong6760@dingtalk.com> Date: 星期四, 21 九月 2023 14:38:56 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- company_admin/.env.development | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/company_admin/.env.development b/company_admin/.env.development index d53d032..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/' -VUE_APP_API = 'http://192.168.0.15:10022/' +<<<<<<< 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