From 0c045df28935e21879b8c0b58b58311c011294c5 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 09 五月 2025 16:42:52 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- admin/.env.development | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/admin/.env.development b/admin/.env.development index 577bf1c..fc24b85 100644 --- a/admin/.env.development +++ b/admin/.env.development @@ -2,7 +2,12 @@ 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 = '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