diff --git a/sub-government-affairs-service/src/layouts/component/Avatar/index.vue b/sub-government-affairs-service/src/layouts/component/Avatar/index.vue
index a249430..da84dd0 100644
--- a/sub-government-affairs-service/src/layouts/component/Avatar/index.vue
+++ b/sub-government-affairs-service/src/layouts/component/Avatar/index.vue
@@ -44,9 +44,12 @@ const PermissionStore = usePermissionStore();
 
 // 用户信息
 const userInfo = computed(() => UserStore.getUserInfo());
+// eslint-disable-next-line vue/return-in-computed-property
 const roles = computed(() => {
-  const arr = userInfo.value.roles.map((item) => item.roleName);
-  return arr.join(' | ');
+  if (userInfo.value.roles) {
+    const arr = userInfo.value.roles.map((item) => item.roleName);
+    return arr.join(' | ');
+  }
 });
 
 const logOut = async () => {
diff --git a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js
index 3311779..b637949 100644
--- a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js
+++ b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js
@@ -23,17 +23,10 @@ const inputSuppliesRoutes = [
         meta: { title: '投入品管理', icon: 'OfficeBuilding' },
         children: [
           {
-<<<<<<< HEAD
             path: '/sub-government-affairs-service/material/pesticide',
             name: 'input-supplies-pesticide',
             component: () => import('@/views/inputSuppliesManage/material/pesticide/index.vue'),
             meta: { title: '农药管理', icon: '' },
-=======
-            path: '/sub-government-affairs-service/material/seed',
-            name: 'input-supplies-seed',
-            component: () => import('@/views/inputSuppliesManage/material/seed/index.vue'),
-            meta: { title: '种源管理', icon: 'Document' },
->>>>>>> dev
           },
           {
             path: '/sub-government-affairs-service/material/fertilizer',
@@ -54,15 +47,12 @@ const inputSuppliesRoutes = [
             meta: { title: '兽药管理', icon: '' },
           },
           {
-<<<<<<< HEAD
             path: '/sub-government-affairs-service/material/seed',
             name: 'input-supplies-seed',
             component: () => import('@/views/inputSuppliesManage/material/seed/index.vue'),
             meta: { title: '种源管理', icon: '' },
           },
           {
-=======
->>>>>>> dev
             path: '/sub-government-affairs-service/material/farmMachinery',
             name: 'input-supplies-farmMachinery',
             component: () => import('@/views/inputSuppliesManage/material/farmMachinery/index.vue'),
diff --git a/sub-government-affairs-service/src/router/modules/productOperateMain.js b/sub-government-affairs-service/src/router/modules/productOperateMain.js
index 448b08d..8ec8eb7 100644
--- a/sub-government-affairs-service/src/router/modules/productOperateMain.js
+++ b/sub-government-affairs-service/src/router/modules/productOperateMain.js
@@ -15,7 +15,6 @@ export default [
         meta: { title: '数据可视化管理', icon: '' },
       },
       {
-<<<<<<< HEAD
         path: '/sub-government-affairs-service/individual',
         component: () => import('@/views/productOperateMain/individual/index.vue'),
         name: 'individual',
@@ -38,12 +37,6 @@ export default [
         component: () => import('@/views/productOperateMain/enterprise/index.vue'),
         name: 'enterprise',
         meta: { title: '经营企业', icon: '' },
-=======
-        path: '/sub-government-affairs-service/businessEntity',
-        component: () => import('@/views/productOperateMain/businessEntity/index.vue'),
-        name: 'businessEntity',
-        meta: { title: '经营主体', icon: 'Document' },
->>>>>>> dev
       },
       // {
       //   path: '/sub-government-affairs-service/individual',
@@ -73,21 +66,13 @@ export default [
         path: '/sub-government-affairs-service/examineList',
         component: () => import('@/views/productOperateMain/examine/list.vue'),
         name: 'examineList',
-<<<<<<< HEAD
         meta: { title: '主体审核管理', icon: '' },
-=======
-        meta: { title: '待审核', icon: 'Document' },
->>>>>>> dev
       },
       {
         path: '/sub-government-affairs-service/examineRecord',
         component: () => import('@/views/productOperateMain/examine/record.vue'),
         name: 'examineRecord',
-<<<<<<< HEAD
         meta: { title: '主体审核历史', icon: '' },
-=======
-        meta: { title: '审核历史', icon: 'Document' },
->>>>>>> dev
       },
     ],
   },
diff --git a/sub-operation-service/src/router/index.js b/sub-operation-service/src/router/index.js
index e3fb45b..f6d6246 100644
--- a/sub-operation-service/src/router/index.js
+++ b/sub-operation-service/src/router/index.js
@@ -123,78 +123,7 @@ export const constantRoutes = [
       },
     ],
   },
-<<<<<<< HEAD
   // ...demo,
-=======
-  {
-    path: '/sub-operation-service/farmingService',
-    name: 'farmingService',
-    component: Layout,
-    redirect: '/sub-operation-service/farmingServiceMain',
-    meta: { title: '农事服务', headerActive: 'farmingService' },
-    children: [
-      {
-        path: '/sub-operation-service/farmingServiceMain',
-        component: () => import('@/views/farmingService/index.vue'),
-        name: 'farmingServiceMain',
-        meta: { title: '农资服务', headerActive: 'farmingService' },
-        children: [
-          {
-            path: 'farmingConsult',
-            component: () => import('@/views/farmingService/farmingConsult/index.vue'),
-            name: 'farmingConsult',
-            meta: { title: '农资服务', headerActive: 'farmingService' },
-          },
-        ],
-      },
-    ],
-  },
-  {
-    path: '/sub-operation-service/userCenter',
-    name: 'userCentre',
-    component: userCentre,
-    redirect: '/sub-operation-service/userCenter-shoppingCart',
-    meta: { title: '个人中心' },
-    children: [
-      {
-        path: '/sub-operation-service/userCenter-shoppingCart',
-        component: () => import('@/views/userCenter/shoppingCart.vue'),
-        name: 'ShoppingCar',
-        meta: { title: '我的购物车' },
-      },
-      {
-        path: '/sub-operation-service/userCenter-sureOrder',
-        component: () => import('@/views/userCenter/sureOrder.vue'),
-        name: 'sureOrder',
-        meta: { title: '确认订单' },
-      },
-      {
-        path: '/sub-operation-service/userCenter-orderSuccess',
-        component: () => import('@/views/userCenter/orderSuccess.vue'),
-        name: 'orderSuccess',
-        meta: { title: '订单提交成功' },
-      },
-      {
-        path: '/sub-operation-service/userCenter-paySuccess',
-        component: () => import('@/views/userCenter/paySuccess.vue'),
-        name: 'paySuccess',
-        meta: { title: '支付成功' },
-      },
-      {
-        path: '/sub-operation-service/userCenter-userOrders',
-        component: () => import('@/views/userCenter/userOrders.vue'),
-        name: 'userOrders',
-        meta: { title: '我的订单' },
-      },
-      {
-        path: '/sub-operation-service/userCenter-userLands',
-        component: () => import('@/views/userCenter/userLands.vue'),
-        name: 'userLands',
-        meta: { title: '我的土地' },
-      },
-    ],
-  },
->>>>>>> dev
 ];
 
 /**