合并冲突解决

vue/src/views/jobUserManager/jobuser/edit.vue

@@ -526,7 +526,6 @@ export default defineComponent(
         pageSize: 99
       });
       // const router = useRouter();
-      const siteuserList = ref([]);
       const provinceList = ref<SelectProps['options']>([{name: '广东省', code: '440000000000000'}]);
       const siteList = ref<SelectProps['options']>();
       const genderList = ref<SelectProps['options']>();