Browse Source

合并冲突

master
lingxiao 2 years ago
parent
commit
1850df371a
2 changed files with 8 additions and 3 deletions
  1. +1
    -1
      .env.JIS5300
  2. +7
    -2
      .env.TRIM

+ 1
- 1
.env.JIS5300 View File

@ -1,4 +1,4 @@
NODE_ENV = 'production'
VUE_APP_BASE_URL = http://101.201.121.115:9010/
VUE_APP_BASE_URL = http://10.0.0.198:9010/
VUE_APP_LOGIN_TITLE = SCCP JIS系统
VUE_APP_LOGIN_LOGO = ../assets/img/logo.png

+ 7
- 2
.env.TRIM View File

@ -1,4 +1,9 @@
NODE_ENV = 'production'
VUE_APP_BASE_URL = http://101.201.121.115:9010/
VUE_APP_LOGIN_TITLE = 安道拓南通面套工厂COS系统
VUE_APP_LOGIN_LOGO = ../assets/img/logo.png
VUE_APP_LOGIN_LOGO = ../assets/img/logo.png
#正式
#VUE_APP_BASE_URL = http://10.104.120.109:9010/
VUE_APP_BASE_URL = https://ntcos.adient.com/
#测试
#VUE_APP_BASE_URL = http://10.227.4.5:9010/
#VUE_APP_BASE_URL = https://ntcos-qa.adient.com/

Loading…
Cancel
Save