From 63aab08cd422e940bf27a6908acd0e93a4df3a5c Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 17 六月 2025 08:53:26 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1 --- company/.env.developmentCom | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/company/.env.developmentCom b/company/.env.developmentCom index 77ad9b7..820a72d 100644 --- a/company/.env.developmentCom +++ b/company/.env.developmentCom @@ -11,10 +11,8 @@ # VUE_APP_API = 'http://localhost:10031/' -<<<<<<< HEAD # VUE_APP_API = 'http://192.168.0.138:10031/' -======= -VUE_APP_API = 'http://192.168.0.138:10031/' ->>>>>>> 5337d6006b45ca61881623ad2e8738e03ad3bde2 -VUE_APP_API = 'https://www.yyb.red/yyb_web_api/' +VUE_APP_API = 'http://192.168.0.129:10031/' + +# VUE_APP_API = 'https://www.yyb.red/yyb_web_api/' -- Gitblit v1.9.3