From 218e84d2264e413f31a2f3957f05bb7b8ad42d5d Mon Sep 17 00:00:00 2001 From: rk <94314517@qq.com> Date: 星期一, 29 九月 2025 10:36:28 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- admin/.env.development | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/admin/.env.development b/admin/.env.development index fc24b85..3661935 100644 --- a/admin/.env.development +++ b/admin/.env.development @@ -2,12 +2,8 @@ NODE_ENV = 'development' # VUE_APP_API_URL = 'https://atwl.ahzyssl.com/zhyq_interface' -<<<<<<< HEAD -VUE_APP_API_URL = 'http://192.168.0.100:10010' +VUE_APP_API_URL = 'http://192.168.1.54:10010' # VUE_APP_API_URL = 'https://atwl.ahzyssl.com/zhyq_interface' -======= -#VUE_APP_API_URL = 'http://192.168.0.104:10010' - VUE_APP_API_URL = 'https://atwl.ahzyssl.com/zhyq_interface' ->>>>>>> f49ead8710e093ee1d2d3ed50870497f07dee9fa # VUE_APP_API_URL = 'http://10.50.250.253:8088/gateway_interface' + -- Gitblit v1.9.3