1 changed files with 5 additions and 0 deletions
--- a/.env.dev
+++ b/.env.dev
@ -13,11 +13,16 @@ 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'