From d35afc038576e0d611f30fbe7cffe891a3e933d5 Mon Sep 17 00:00:00 2001 From: doum <doum> Date: 星期三, 17 十二月 2025 18:49:29 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao --- admin/.env.development | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/admin/.env.development b/admin/.env.development index 6ffc081..5328169 100644 --- a/admin/.env.development +++ b/admin/.env.development @@ -3,19 +3,11 @@ # VUE_APP_API_URL = 'https://atwl.ahzyssl.com/zhyq_interface' -<<<<<<< HEAD -# VUE_APP_API_URL = 'http://192.168.1.45:10010' +#VUE_APP_API_URL = 'http://192.168.1.45:10010' VUE_APP_API_URL = 'http://192.168.0.7/system_gateway' -======= -VUE_APP_API_URL = 'http://localhost:10010' -#VUE_APP_API_URL = 'http://192.168.0.7/system_gateway' ->>>>>>> ce3b9c67f6b2ee83d7edf593d06221d909e9afda - -# VUE_APP_API_URL = 'http://localhost:10010' - -# VUE_APP_API_URL = 'https://atwl.ahzyssl.com/zhyq_interface' +#VUE_APP_API_URL = 'http://localhost:10010' #key锛�045542fc5f436b75e6c911c5c84ff8cd #瀵嗛挜锛�8bd38497f9aee2b75e7a888a4dfd1e6c -- Gitblit v1.9.3