From 30b2d19710d2f0c3154025b6e1073fddf6591ba8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Tue, 9 Jan 2024 16:28:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/.env.dev b/.env.dev
index 2e665ce1..6fffe53a 100644
--- a/.env.dev
+++ b/.env.dev
@@ -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'