mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
‘937886381’ 2024-01-09 16:28:50 +08:00
parent 040b76d276
commit 30b2d19710
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.env.dev
View File

@ -1,13 +1,8 @@
###
# @Author: Do not edit
# @Date: 2023-08-29 09:40:39
<<<<<<< HEAD
# @LastEditTime: 2024-01-09 16:25:57
# @LastEditTime: 2024-01-09 16:27:57
# @LastEditors: zhp
=======
# @LastEditTime: 2024-01-08 16:23:54
# @LastEditors: DY
>>>>>>> projects/mesxc-test
# @Description:
###
# 开发环境配置
@ -28,21 +23,12 @@ VUE_APP_BASE_API = 'http://192.168.0.33:48082'
# VUE_APP_BASE_API = 'http://192.168.1.104:48082'
# VUE_APP_BASE_API = 'http://192.168.1.62:48082'
# VUE_APP_BASE_API = 'http://192.168.1.78:48082'
<<<<<<< HEAD
# socket地址
VUE_APP_Socket_API = 'ws://192.168.0.30:8888'
=======
<<<<<<< HEAD
# dcs地址
VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
=======
>>>>>>> projects/mesxc-test
# socket地址
VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
# VUE_APP_Socket_API = 'ws://192.168.0.33:48082'
>>>>>>> projects/mesxc-test
# 积木报表指向地址
VUE_APP_JIMU_API = 'http://10.70.2.22:8080'