From dd6a43fdbadaaf6d646b3eb2ca0a63f58ed77ea4 Mon Sep 17 00:00:00 2001 From: doum <doum> Date: 星期三, 29 十月 2025 15:56:22 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao --- admin/.env.development | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/admin/.env.development b/admin/.env.development index fc24b85..3747781 100644 --- a/admin/.env.development +++ b/admin/.env.development @@ -2,12 +2,16 @@ 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.45:10010' + +# VUE_APP_API_URL = 'http://192.168.0.212/system_gateway' + +# VUE_APP_API_URL = 'http://localhost: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' +#key锛�045542fc5f436b75e6c911c5c84ff8cd +#瀵嗛挜锛�8bd38497f9aee2b75e7a888a4dfd1e6c +VUE_APP_AMAP_KEY='045542fc5f436b75e6c911c5c84ff8cd' -- Gitblit v1.9.3