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

apps/web-antd/src/views/property/resident/person/data.ts

@@ -223,12 +223,15 @@ export const modalSchema: FormSchemaGetter = () => [
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
     },
+<<<<<<< HEAD
+=======
     dependencies: {
       show: (values) => {
         return typeof (values.id) !== 'undefined'
       },
       triggerFields: ['id'],
     }
+>>>>>>> 54ed694271a4aeb1c3d592f9200e037fb524361f
   },
   {
     label: '通行权限组',
@@ -241,6 +244,7 @@ export const modalSchema: FormSchemaGetter = () => [
       triggerFields: ['id'],
     },
     componentProps: {
+      allowClear: true,
       resultField: 'list', // 根据API返回结构调整
       labelField: 'name',
       valueField: 'id',
@@ -257,7 +261,11 @@ export const modalSchema: FormSchemaGetter = () => [
         }
         return authGroupArr
       },
+<<<<<<< HEAD
+    },
+=======
     }
+>>>>>>> 54ed694271a4aeb1c3d592f9200e037fb524361f
   },
   {
     label: '人脸图片',