diff --git a/yunxi-ui-admin-vben/src/views/xxjj/service/index.vue b/yunxi-ui-admin-vben/src/views/xxjj/service/index.vue
index 0bcd993..a841ac0 100644
--- a/yunxi-ui-admin-vben/src/views/xxjj/service/index.vue
+++ b/yunxi-ui-admin-vben/src/views/xxjj/service/index.vue
@@ -1,58 +1,14 @@
-<<<<<<< HEAD:yudao-ui-admin-vben-master/src/views/xxjj/customer/index.vue
-=======
-<template>
-  <div>
-    <BasicTable @register="registerTable">
-      <template #toolbar>
-        <a-button type="primary" v-auth="['xxjj:subject-basic:create']" :preIcon="IconEnum.ADD" @click="handleCreate">
-          {{ t('action.create') }}
-        </a-button>
-        <a-button type="warning" v-auth="['xxjj:subject-basic:export']" :preIcon="IconEnum.EXPORT" @click="handleExport">
-          {{ t('action.export') }}
-        </a-button>
-      </template>
-      <template #bodyCell="{ column, record }">
-        <template v-if="column.key === 'action'">
-          <TableAction
-             :actions="[
-               { icon: IconEnum.EDIT, label: t('action.edit'), auth: 'xxjj:subject-basic:update', onClick: handleEdit.bind(null, record) },
-               {
-                  icon: IconEnum.DELETE,
-                  color: 'error',
-                  label: t('action.delete'),
-                  auth: 'xxjj:subject-basic:delete',
-                  popConfirm: {
-                    title: t('common.delMessage'),
-                    placement: 'left',
-                    confirm: handleDelete.bind(null, record)
-                  }
-              }
-            ]"
-          />
-        </template>
-      </template>
-    </BasicTable>
-    <SubjectBasicModal @register="registerModal" @success="reload()" />
-  </div>
-</template>
->>>>>>> add9532e04020984b8af814009400f6d2b947fce:yunxi-ui-admin-vben/src/views/xxjj/service/index.vue
 <script lang="ts" setup>
 import CustomerModal from './CustomerModal.vue'
-import { columns, searchFormSchema } from './customer.data'
 import { useI18n } from '@/hooks/web/useI18n'
 import { useMessage } from '@/hooks/web/useMessage'
 import { useModal } from '@/components/Modal'
-<<<<<<< HEAD:yudao-ui-admin-vben-master/src/views/xxjj/customer/index.vue
-import { IconEnum } from '@/enums/appEnum'
-import { BasicTable, TableAction, useTable } from '@/components/Table'
-import { deleteCustomer, exportCustomer, getCustomerPage } from '@/api/xxjj/customer'
-=======
+
 import SubjectBasicModal from './SubjectBasicModal.vue'
 import { IconEnum } from '@/enums/appEnum'
 import { BasicTable, useTable, TableAction } from '@/components/Table'
 import { deleteSubjectBasic, exportSubjectBasic, getSubjectBasicPage } from '@/api/xxjj/subjectBasic'
 import { columns, searchFormSchema } from './subjectBasic.data'
->>>>>>> add9532e04020984b8af814009400f6d2b947fce:yunxi-ui-admin-vben/src/views/xxjj/service/index.vue
 
 defineOptions({ name: 'service' })