Merge pull request '1' (#172 ) from projects/mesxc-zjl into projects/mesxc-test

Reviewed-on: #172
1
2024-01-05 11:20:07 +08:00 · 2024-01-05 11:19:39 +08:00
1 changed files with 0 additions and 5 deletions
--- a/.env.dev
+++ b/.env.dev
@ -13,16 +13,11 @@ VUE_APP_TITLE = MES系统

 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://100.64.0.26:48082'
-<<<<<<< HEAD

 VUE_APP_BASE_API = 'http://192.168.0.33:48082'

 # VUE_APP_BASE_API = 'http://10.70.2.2:8080'

-=======
-# VUE_APP_BASE_API = 'http://10.70.2.2:8080'
-# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
->>>>>>> projects/mesxc-test
 # VUE_APP_BASE_API = 'http://192.168.4.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.49:48082'
Author	SHA1	Message	Date
juzi	b7ab59d5cd	Merge pull request '1' (#172 ) from projects/mesxc-zjl into projects/mesxc-test Reviewed-on: #172	2024-01-05 11:20:07 +08:00
juzi	d619db3d89	1	2024-01-05 11:19:39 +08:00