From a40f04df315c5159a9f3d46c455143051fc34862 Mon Sep 17 00:00:00 2001
From: 13713575202 <1345916905@qq.com>
Date: Wed, 14 May 2025 15:37:48 +0800
Subject: [PATCH] =?UTF-8?q?xiabin=E4=BF=AE=E6=94=B9app.js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/src/micro/app.js | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

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',