diff --git a/sub-operation-service/.env.development b/sub-operation-service/.env.development
index d976afd..0aa1dcc 100644
--- a/sub-operation-service/.env.development
+++ b/sub-operation-service/.env.development
@@ -1,9 +1,5 @@
 # 开发环境
 VITE_PORT = 9526
-<<<<<<< HEAD
-=======
-VITE_MODE = 'DEV'
->>>>>>> 72be137aba334c5c79ccf1cd83763de284a8f730
 VITE_APP_MIAN = 'daimp-front-main'
 VITE_APP_MIAN_URL = 'http://localhost:9000'
 VITE_APP_NAME = 'sub-operation-service'
@@ -11,4 +7,3 @@ VITE_APP_BASE_API = '/apis'
 VITE_APP_BASE_URL = 'http://192.168.18.99:8080'
 VITE_APP_UPLOAD_API = '/uploadApis'
 VITE_APP_UPLOAD_URL = 'http://192.168.18.99:9300'
-