Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5

apps/web-antd/src/views/property/attendanceManagement/workforceManagement/scheduleView.vue

@@ -137,7 +137,7 @@ defineExpose({
                 >
                   <ghost-button
                     danger
-                    v-access:code="['property:arrangement:remove']"
+                    v-access:code="['Property:arrangement:remove']"
                     @click.stop=""
                   >
                     移除

apps/web-antd/src/views/property/costManagement/carCharge/data.ts

@@ -6,9 +6,7 @@ import type { VxeGridProps } from '#/adapter/vxe-table';
 import { getDictOptions } from '#/utils/dict';
 import { renderDict } from '#/utils/render';
 import { costItemSettingList } from '#/api/property/costManagement/costItemSetting';
-import { personList } from '#/api/property/resident/person';
+import { userList } from '#/api/system/user';
-import { communityTree } from '#/api/property/community';
-import { handleNode } from '@vben/utils';
 
 /**
  * 查询表单 schema
@@ -25,12 +23,12 @@ export const querySchema: FormSchemaGetter = () => [
     component: 'ApiSelect',
     componentProps: {
       api: async () => {
-        const rows = await personList({ pageSize: 1000000000, pageNum: 1 });
+        const rows = await userList({ pageSize: 1000000000, pageNum: 1 });
         return rows;
       },
       resultField: 'rows',
       labelField: 'userName',
-      valueField: 'id',
+      valueField: 'userId',
     },
   },
   {
@@ -106,12 +104,12 @@ export const modalSchema: FormSchemaGetter = () => [
     rules: 'required',
     componentProps: {
       api: async () => {
-        const rows = await personList({ pageSize: 1000000000, pageNum: 1 });
+        const rows = await userList({ pageSize: 1000000000, pageNum: 1 });
         return rows;
       },
       resultField: 'rows',
       labelField: 'userName',
-      valueField: 'id',
+      valueField: 'userId',
     },
     disabled: true,
   },
@@ -210,12 +208,12 @@ export const addModalSchema: FormSchemaGetter = () => [
     rules: 'required',
     componentProps: {
       api: async () => {
-        const rows = await personList({ pageSize: 1000000000, pageNum: 1 });
+        const rows = await userList({ pageSize: 1000000000, pageNum: 1 });
         return rows;
       },
       resultField: 'rows',
       labelField: 'userName',
-      valueField: 'id',
+      valueField: 'userId',
     },
   },
   {