修改合并错分支问题

src/views/infra/job/JobLog.vue

@@ -49,7 +49,6 @@
 </template>
 <script setup lang="ts" name="JobLog">
 import dayjs from 'dayjs'
-
 import * as JobLogApi from '@/api/infra/jobLog'
 import { allSchemas } from './jobLog.data'
 

src/views/infra/job/job.data.ts

@@ -1,6 +1,7 @@
 import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas'
 const { t } = useI18n() // 国际化
 // 表单校验
+
 export const rules = reactive({
   name: [required],
   handlerName: [required],

src/views/infra/job/jobLog.data.ts

@@ -1,5 +1,6 @@
 import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas'
 // 国际化
+
 const { t } = useI18n()
 // CrudSchema
 const crudSchemas = reactive<VxeCrudSchema>({