diff --git a/main/src/micro/app.js b/main/src/micro/app.js
index fede9a2..9918256 100644
--- a/main/src/micro/app.js
+++ b/main/src/micro/app.js
@@ -1,10 +1,6 @@
 import actions from './actions';
 
-<<<<<<< HEAD
 const { VITE_APP_SUB_OS, VITE_APP_SUB_ADMIN, VITE_APP_SUB_GAS, VITE_APP_SUB_GSS, VITE_APP_SUB_GSR } = import.meta.env;
-=======
-const { VITE_APP_SUB_OS, VITE_APP_SUB_OA, VITE_APP_SUB_APP, VITE_APP_SUB_GAA, VITE_APP_SUB_GAS, VITE_APP_SUB_GSS } = import.meta.env;
->>>>>>> dev
 
 export const leftApps = [
   {
@@ -16,14 +12,14 @@ export const leftApps = [
   },
   {
     name: 'sub-operation-admin',
-    entry: VITE_APP_SUB_OA,
+    entry: VITE_APP_SUB_OS,
     activeRule: '/sub-operation-admin',
     title: '管理后台',
     icon: 'images/platform/icon-admin.png',
   },
   {
     name: 'sub-app',
-    entry: VITE_APP_SUB_APP,
+    entry: VITE_APP_SUB_GAS,
     activeRule: '/sub-app',
     title: 'APP',
     icon: 'images/platform/icon-app.png',
@@ -47,14 +43,14 @@ export const rightApps = [
   },
   {
     name: 'sub-government-admin',
-    entry: VITE_APP_SUB_GAA,
+    entry: VITE_APP_SUB_GAS,
     activeRule: '/sub-government-affairs-service',
     title: '管理后台',
     icon: 'images/platform/icon-admin.png',
   },
   {
     name: 'sub-app',
-    entry: VITE_APP_SUB_APP,
+    entry: VITE_APP_SUB_GAS,
     activeRule: '/sub-app',
     title: 'APP',
     icon: 'images/platform/icon-app.png',
@@ -81,7 +77,7 @@ export const defaultApps = [
   },
   {
     name: 'sub-operation-admin',
-    entry: VITE_APP_SUB_OA,
+    entry: VITE_APP_SUB_OS,
     activeRule: '/sub-operation-admin',
     title: '运营管理后台',
     icon: 'images/platform/icon-admin.png',