Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_ETL_WEBFRONT into langfang-test

# Conflicts: # .env.dev # .env.test
配置信息更新
--- a/.env.prod
+++ b/.env.prod
@ -1,4 +1,4 @@
 NODE_ENV = 'production'
 VUE_APP_BASE_URL = http://192.168.1.242:8091/
 VUE_APP_BASE_URL = http://10.127.47.152:8091/
 VUE_APP_LOGIN_TITLE = 沈阳领新智科智能信息系统有限公司
 VUE_APP_LOGIN_LOGO = ../assets/img/logo.png
--- a/.env.test
+++ b/.env.test
@ -1,4 +1,4 @@
 NODE_ENV = 'production'
 VUE_APP_BASE_URL = http://101.201.121.115:9010/
 VUE_APP_BASE_URL = http://10.127.47.152:9010/
 VUE_APP_LOGIN_TITLE = 沈阳领新智科智能信息系统有限公司
 VUE_APP_LOGIN_LOGO = ../assets/img/logo.png
Author	SHA1	Message	Date
wangxy	57bc51e8a4	Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_ETL_WEBFRONT into langfang-test # Conflicts: # .env.dev # .env.test	3 years ago
liwei	7ad65b9c2e	配置信息更新	3 years ago