diff --git a/apps/web-antd/src/api/property/building/model.d.ts b/apps/web-antd/src/api/property/building/model.d.ts
index c1e72a70..ff1a7de9 100644
--- a/apps/web-antd/src/api/property/building/model.d.ts
+++ b/apps/web-antd/src/api/property/building/model.d.ts
@@ -2,7 +2,7 @@ import type { PageQuery, BaseEntity } from '#/api/common';
 
 export interface BuildingVO {
   /**
-   * id
+   * 
    */
   id: string | number;
 
@@ -109,18 +109,33 @@ export interface BuildingVO {
   /**
    * 排序字段
    */
-  order: number;
+  sort: number;
 
   /**
    * 组织编码
    */
   orgCode: string;
 
+  /**
+   * 数据状态：1有效，0无效
+   */
+  dataState: number;
+
+  /**
+   * 修改时间
+   */
+  modifyTime: string;
+
+  /**
+   * 搜索值
+   */
+  searchValue: string;
+
 }
 
 export interface BuildingForm extends BaseEntity {
   /**
-   * id
+   * 
    */
   id?: string | number;
 
@@ -227,13 +242,28 @@ export interface BuildingForm extends BaseEntity {
   /**
    * 排序字段
    */
-  order?: number;
+  sort?: number;
 
   /**
    * 组织编码
    */
   orgCode?: string;
 
+  /**
+   * 数据状态：1有效，0无效
+   */
+  dataState?: number;
+
+  /**
+   * 修改时间
+   */
+  modifyTime?: string;
+
+  /**
+   * 搜索值
+   */
+  searchValue?: string;
+
 }
 
 export interface BuildingQuery extends PageQuery {
@@ -297,6 +327,71 @@ export interface BuildingQuery extends PageQuery {
    */
   cqbh?: string;
 
+  /**
+   * 图地编号
+   */
+  tdbh?: string;
+
+  /**
+   * 建筑面积
+   */
+  jzmj?: number;
+
+  /**
+   * 产权面积
+   */
+  cqmj?: number;
+
+  /**
+   * 可租面积
+   */
+  kzmj?: number;
+
+  /**
+   * 自用面积
+   */
+  zymj?: number;
+
+  /**
+   * 配套面积
+   */
+  ptmj?: number;
+
+  /**
+   * 车位面积
+   */
+  cwmj?: number;
+
+  /**
+   * 标准层高
+   */
+  bzcg?: number;
+
+  /**
+   * 排序字段
+   */
+  sort?: number;
+
+  /**
+   * 组织编码
+   */
+  orgCode?: string;
+
+  /**
+   * 数据状态：1有效，0无效
+   */
+  dataState?: number;
+
+  /**
+   * 修改时间
+   */
+  modifyTime?: string;
+
+  /**
+   * 搜索值
+   */
+  searchValue?: string;
+
   /**
     * 日期范围参数
     */
diff --git a/apps/web-antd/src/api/property/ceremonialServe/model.d.ts b/apps/web-antd/src/api/property/ceremonialServe/model.d.ts
index c12a47db..ccc642d1 100644
--- a/apps/web-antd/src/api/property/ceremonialServe/model.d.ts
+++ b/apps/web-antd/src/api/property/ceremonialServe/model.d.ts
@@ -1,6 +1,11 @@
 import type { PageQuery, BaseEntity } from '#/api/common';
 
 export interface CeremonialServeVO {
+  /**
+   * id
+   */
+  id: string | number;
+
   /**
    * 分类id
    */
@@ -46,6 +51,11 @@ export interface CeremonialServeVO {
    */
   servePrice: number;
 
+  /**
+   * 数据状态（模拟删除 0:删除 1:未删除）
+   */
+  dataStauts: number;
+
   /**
    * 产品图片
    */
@@ -109,6 +119,11 @@ export interface CeremonialServeForm extends BaseEntity {
    */
   servePrice?: number;
 
+  /**
+   * 数据状态（模拟删除 0:删除 1:未删除）
+   */
+  dataStauts?: number;
+
   /**
    * 产品图片
    */
@@ -167,6 +182,11 @@ export interface CeremonialServeQuery extends PageQuery {
    */
   servePrice?: number;
 
+  /**
+   * 数据状态（模拟删除 0:删除 1:未删除）
+   */
+  dataStauts?: number;
+
   /**
    * 产品图片
    */
diff --git a/apps/web-antd/src/api/property/cityArea/model.d.ts b/apps/web-antd/src/api/property/cityArea/model.d.ts
index 571567ab..60d4eb64 100644
--- a/apps/web-antd/src/api/property/cityArea/model.d.ts
+++ b/apps/web-antd/src/api/property/cityArea/model.d.ts
@@ -1,6 +1,11 @@
 import type { PageQuery, BaseEntity } from '#/api/common';
 
 export interface CityAreaVO {
+  /**
+   * 主键ID
+   */
+  id: string | number;
+
   /**
    * 城市编码
    */
@@ -36,6 +41,11 @@ export interface CityAreaVO {
    */
   lat: string;
 
+  /**
+   * 数据状态：1有效，0无效
+   */
+  dataState: number;
+
 }
 
 export interface CityAreaForm extends BaseEntity {
@@ -79,6 +89,11 @@ export interface CityAreaForm extends BaseEntity {
    */
   lat?: string;
 
+  /**
+   * 数据状态：1有效，0无效
+   */
+  dataState?: number;
+
 }
 
 export interface CityAreaQuery extends PageQuery {
@@ -117,6 +132,11 @@ export interface CityAreaQuery extends PageQuery {
    */
   lat?: string;
 
+  /**
+   * 数据状态：1有效，0无效
+   */
+  dataState?: number;
+
   /**
     * 日期范围参数
     */
diff --git a/apps/web-antd/src/api/property/community/model.d.ts b/apps/web-antd/src/api/property/community/model.d.ts
index 195bfae3..b820b221 100644
--- a/apps/web-antd/src/api/property/community/model.d.ts
+++ b/apps/web-antd/src/api/property/community/model.d.ts
@@ -1,6 +1,11 @@
 import type { PageQuery, BaseEntity } from '#/api/common';
 
 export interface CommunityVO {
+  /**
+   * 主键
+   */
+  id: string | number;
+
   /**
    * 社区名称
    */
@@ -56,11 +61,21 @@ export interface CommunityVO {
    */
   orgCode: string;
 
+  /**
+   * 数据状态：1有效，0无效
+   */
+  dataState: number;
+
+  /**
+   * 修改时间
+   */
+  modifyTime: string;
+
 }
 
 export interface CommunityForm extends BaseEntity {
   /**
-   * 主键id
+   * 主键
    */
   id?: string | number;
 
@@ -119,6 +134,16 @@ export interface CommunityForm extends BaseEntity {
    */
   orgCode?: string;
 
+  /**
+   * 数据状态：1有效，0无效
+   */
+  dataState?: number;
+
+  /**
+   * 修改时间
+   */
+  modifyTime?: string;
+
 }
 
 export interface CommunityQuery extends PageQuery {
@@ -182,6 +207,11 @@ export interface CommunityQuery extends PageQuery {
    */
   dataState?: number;
 
+  /**
+   * 修改时间
+   */
+  modifyTime?: string;
+
   /**
     * 日期范围参数
     */
diff --git a/apps/web-antd/src/api/property/deviceType/model.d.ts b/apps/web-antd/src/api/property/deviceType/model.d.ts
index fab70a4c..44a078ec 100644
--- a/apps/web-antd/src/api/property/deviceType/model.d.ts
+++ b/apps/web-antd/src/api/property/deviceType/model.d.ts
@@ -1,6 +1,11 @@
 import type { PageQuery, BaseEntity } from '#/api/common';
 
 export interface DeviceTypeVO {
+  /**
+   * 主键
+   */
+  id: string | number;
+
   /**
    * 设备类型编码
    */
@@ -30,7 +35,7 @@ export interface DeviceTypeVO {
 
 export interface DeviceTypeForm extends BaseEntity {
   /**
-   * 数据库id
+   * 主键
    */
   id?: string | number;
 
diff --git a/apps/web-antd/src/api/property/e8Config/model.d.ts b/apps/web-antd/src/api/property/e8Config/model.d.ts
index cb7f7cf2..c3a8d977 100644
--- a/apps/web-antd/src/api/property/e8Config/model.d.ts
+++ b/apps/web-antd/src/api/property/e8Config/model.d.ts
@@ -1,6 +1,11 @@
 import type { PageQuery, BaseEntity } from '#/api/common';
 
 export interface E8ConfigVO {
+  /**
+   * 主键
+   */
+  id: string | number;
+
   /**
    * E8 名称
    */
@@ -21,11 +26,16 @@ export interface E8ConfigVO {
    */
   orgCode: string;
 
+  /**
+   * 数据状态：1有效，0无效
+   */
+  dataState: number;
+
 }
 
 export interface E8ConfigForm extends BaseEntity {
   /**
-   * ID
+   * 主键
    */
   id?: string | number;
 
@@ -49,6 +59,11 @@ export interface E8ConfigForm extends BaseEntity {
    */
   orgCode?: string;
 
+  /**
+   * 数据状态：1有效，0无效
+   */
+  dataState?: number;
+
 }
 
 export interface E8ConfigQuery extends PageQuery {
diff --git a/apps/web-antd/src/api/property/factory/model.d.ts b/apps/web-antd/src/api/property/factory/model.d.ts
index 603ee662..f06f2bc2 100644
--- a/apps/web-antd/src/api/property/factory/model.d.ts
+++ b/apps/web-antd/src/api/property/factory/model.d.ts
@@ -1,6 +1,11 @@
 import type { PageQuery, BaseEntity } from '#/api/common';
 
 export interface FactoryVO {
+  /**
+   * 
+   */
+  id: string | number;
+
   /**
    * 厂商编码
    */
@@ -21,14 +26,24 @@ export interface FactoryVO {
    */
   dataState: number;
 
+  /**
+   * 搜索值
+   */
+  searchValue: string;
+
 }
 
 export interface FactoryForm extends BaseEntity {
   /**
-   * 数据库id
+   * 
    */
   id?: string | number;
 
+  /**
+   * 厂商编码
+   */
+  factoryNo?: string;
+
   /**
    * 设备厂商名称
    */
@@ -44,6 +59,11 @@ export interface FactoryForm extends BaseEntity {
    */
   dataState?: number;
 
+  /**
+   * 搜索值
+   */
+  searchValue?: string;
+
 }
 
 export interface FactoryQuery extends PageQuery {
@@ -62,6 +82,11 @@ export interface FactoryQuery extends PageQuery {
    */
   dataState?: number;
 
+  /**
+   * 搜索值
+   */
+  searchValue?: string;
+
   /**
     * 日期范围参数
     */
diff --git a/apps/web-antd/src/api/property/floor/model.d.ts b/apps/web-antd/src/api/property/floor/model.d.ts
index 370e6895..f1376f8c 100644
--- a/apps/web-antd/src/api/property/floor/model.d.ts
+++ b/apps/web-antd/src/api/property/floor/model.d.ts
@@ -1,11 +1,6 @@
 import type { PageQuery, BaseEntity } from '#/api/common';
 
 export interface FloorVO {
-  /**
-   * 
-   */
-  id: string | number;
-
   /**
    * 社区编码
    */
@@ -31,31 +26,11 @@ export interface FloorVO {
    */
   orgCode: string;
 
-  /**
-   * 数据状态：1有效，0无效
-   */
-  dataState: number;
-
-  /**
-   * 创建人
-   */
-  createEmpId: string | number;
-
-  /**
-   * 修改时间
-   */
-  modifyTime: string;
-
-  /**
-   * 搜索值
-   */
-  searchValue: string;
-
 }
 
 export interface FloorForm extends BaseEntity {
   /**
-   * 
+   * ID
    */
   id?: string | number;
 
@@ -84,26 +59,6 @@ export interface FloorForm extends BaseEntity {
    */
   orgCode?: string;
 
-  /**
-   * 数据状态：1有效，0无效
-   */
-  dataState?: number;
-
-  /**
-   * 创建人
-   */
-  createEmpId?: string | number;
-
-  /**
-   * 修改时间
-   */
-  modifyTime?: string;
-
-  /**
-   * 搜索值
-   */
-  searchValue?: string;
-
 }
 
 export interface FloorQuery extends PageQuery {
@@ -137,21 +92,6 @@ export interface FloorQuery extends PageQuery {
    */
   dataState?: number;
 
-  /**
-   * 创建人
-   */
-  createEmpId?: string | number;
-
-  /**
-   * 修改时间
-   */
-  modifyTime?: string;
-
-  /**
-   * 搜索值
-   */
-  searchValue?: string;
-
   /**
     * 日期范围参数
     */
diff --git a/apps/web-antd/src/api/property/visitorManagement/model.d.ts b/apps/web-antd/src/api/property/visitorManagement/model.d.ts
index ba0648d1..3aa6afe9 100644
--- a/apps/web-antd/src/api/property/visitorManagement/model.d.ts
+++ b/apps/web-antd/src/api/property/visitorManagement/model.d.ts
@@ -1,6 +1,11 @@
 import type { PageQuery, BaseEntity } from '#/api/common';
 
 export interface VisitorManagementVO {
+  /**
+   * id
+   */
+  id: string | number;
+
   /**
    * 访客姓名
    */
diff --git a/apps/web-antd/src/views/property/building/data.ts b/apps/web-antd/src/views/property/building/data.ts
index f1866821..d3c7027e 100644
--- a/apps/web-antd/src/views/property/building/data.ts
+++ b/apps/web-antd/src/views/property/building/data.ts
@@ -69,6 +69,76 @@ export const querySchema: FormSchemaGetter = () => [
     fieldName: 'cqbh',
     label: '产权编号',
   },
+  {
+    component: 'Input',
+    fieldName: 'tdbh',
+    label: '图地编号',
+  },
+  {
+    component: 'Input',
+    fieldName: 'jzmj',
+    label: '建筑面积',
+  },
+  {
+    component: 'Input',
+    fieldName: 'cqmj',
+    label: '产权面积',
+  },
+  {
+    component: 'Input',
+    fieldName: 'kzmj',
+    label: '可租面积',
+  },
+  {
+    component: 'Input',
+    fieldName: 'zymj',
+    label: '自用面积',
+  },
+  {
+    component: 'Input',
+    fieldName: 'ptmj',
+    label: '配套面积',
+  },
+  {
+    component: 'Input',
+    fieldName: 'cwmj',
+    label: '车位面积',
+  },
+  {
+    component: 'Input',
+    fieldName: 'bzcg',
+    label: '标准层高',
+  },
+  {
+    component: 'Input',
+    fieldName: 'sort',
+    label: '排序字段',
+  },
+  {
+    component: 'Input',
+    fieldName: 'orgCode',
+    label: '组织编码',
+  },
+  {
+    component: 'Input',
+    fieldName: 'dataState',
+    label: '数据状态：1有效，0无效',
+  },
+  {
+    component: 'DatePicker',
+    componentProps: {
+      showTime: true,
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+    },
+    fieldName: 'modifyTime',
+    label: '修改时间',
+  },
+  {
+    component: 'Input',
+    fieldName: 'searchValue',
+    label: '搜索值',
+  },
 ];
 
 // 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
@@ -76,7 +146,7 @@ export const querySchema: FormSchemaGetter = () => [
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
   {
-    title: 'id',
+    title: '',
     field: 'id',
   },
   {
@@ -167,12 +237,24 @@ export const columns: VxeGridProps['columns'] = [
   },
   {
     title: '排序字段',
-    field: 'order',
+    field: 'sort',
   },
   {
     title: '组织编码',
     field: 'orgCode',
   },
+  {
+    title: '数据状态：1有效，0无效',
+    field: 'dataState',
+  },
+  {
+    title: '修改时间',
+    field: 'modifyTime',
+  },
+  {
+    title: '搜索值',
+    field: 'searchValue',
+  },
   {
     field: 'action',
     fixed: 'right',
@@ -184,7 +266,7 @@ export const columns: VxeGridProps['columns'] = [
 
 export const modalSchema: FormSchemaGetter = () => [
   {
-    label: 'id',
+    label: '',
     fieldName: 'id',
     component: 'Input',
     dependencies: {
@@ -318,9 +400,8 @@ export const modalSchema: FormSchemaGetter = () => [
   },
   {
     label: '排序字段',
-    fieldName: 'order',
+    fieldName: 'sort',
     component: 'Input',
-    rules: 'required',
   },
   {
     label: '组织编码',
@@ -328,4 +409,24 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'Input',
     rules: 'required',
   },
+  {
+    label: '数据状态：1有效，0无效',
+    fieldName: 'dataState',
+    component: 'Input',
+  },
+  {
+    label: '修改时间',
+    fieldName: 'modifyTime',
+    component: 'DatePicker',
+    componentProps: {
+      showTime: true,
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+    },
+  },
+  {
+    label: '搜索值',
+    fieldName: 'searchValue',
+    component: 'Input',
+  },
 ];
diff --git a/apps/web-antd/src/views/property/ceremonialServe/data.ts b/apps/web-antd/src/views/property/ceremonialServe/data.ts
index 6c1b049d..6e28c624 100644
--- a/apps/web-antd/src/views/property/ceremonialServe/data.ts
+++ b/apps/web-antd/src/views/property/ceremonialServe/data.ts
@@ -66,6 +66,11 @@ export const querySchema: FormSchemaGetter = () => [
     fieldName: 'servePrice',
     label: '服务总价格',
   },
+  {
+    component: 'Input',
+    fieldName: 'dataStauts',
+    label: '数据状态',
+  },
   {
     component: 'Input',
     fieldName: 'serveImage',
@@ -82,6 +87,10 @@ export const querySchema: FormSchemaGetter = () => [
 // export const columns: () => VxeGridProps['columns'] = () => [
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
+  {
+    title: 'id',
+    field: 'id',
+  },
   {
     title: '分类id',
     field: 'classificationId',
@@ -130,6 +139,10 @@ export const columns: VxeGridProps['columns'] = [
     title: '服务总价格',
     field: 'servePrice',
   },
+  {
+    title: '数据状态',
+    field: 'dataStauts',
+  },
   {
     title: '产品图片',
     field: 'serveImage',
@@ -227,20 +240,20 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'Input',
     rules: 'required',
   },
+  {
+    label: '数据状态',
+    fieldName: 'dataStauts',
+    component: 'Input',
+    rules: 'required',
+  },
   {
     label: '产品图片',
     fieldName: 'serveImage',
-    component: 'ImageUpload',
-    componentProps: {
-      // accept: 'image/*', // 可选拓展名或者mime类型 ,拼接
-      // maxCount: 1, // 最大上传文件数 默认为1 为1会绑定为string而非string[]类型
-    },
-    rules: 'required',
+    component: 'Input',
   },
   {
     label: '排序',
     fieldName: 'sort',
     component: 'Input',
-    rules: 'required',
   },
 ];
diff --git a/apps/web-antd/src/views/property/cityArea/data.ts b/apps/web-antd/src/views/property/cityArea/data.ts
index b8fadf46..494f4e66 100644
--- a/apps/web-antd/src/views/property/cityArea/data.ts
+++ b/apps/web-antd/src/views/property/cityArea/data.ts
@@ -44,12 +44,21 @@ export const querySchema: FormSchemaGetter = () => [
     fieldName: 'lat',
     label: '维度',
   },
+  {
+    component: 'Input',
+    fieldName: 'dataState',
+    label: '数据状态：1有效，0无效',
+  },
 ];
 
 // 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
 // export const columns: () => VxeGridProps['columns'] = () => [
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
+  {
+    title: '主键ID',
+    field: 'id',
+  },
   {
     title: '城市编码',
     field: 'areaCode',
@@ -84,6 +93,10 @@ export const columns: VxeGridProps['columns'] = [
     title: '维度',
     field: 'lat',
   },
+  {
+    title: '数据状态：1有效，0无效',
+    field: 'dataState',
+  },
   {
     field: 'action',
     fixed: 'right',
@@ -98,6 +111,7 @@ export const modalSchema: FormSchemaGetter = () => [
     label: '主键ID',
     fieldName: 'id',
     component: 'Input',
+    rules: 'required',
   },
   {
     label: '城市编码',
@@ -148,4 +162,10 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'Input',
     rules: 'required',
   },
+  {
+    label: '数据状态：1有效，0无效',
+    fieldName: 'dataState',
+    component: 'Input',
+    rules: 'required',
+  },
 ];
diff --git a/apps/web-antd/src/views/property/cityArea/index.vue b/apps/web-antd/src/views/property/cityArea/index.vue
index 5316ced9..b2d543aa 100644
--- a/apps/web-antd/src/views/property/cityArea/index.vue
+++ b/apps/web-antd/src/views/property/cityArea/index.vue
@@ -9,10 +9,10 @@ import { getVxePopupContainer } from '@vben/utils';
 import { Modal, Popconfirm, Space } from 'ant-design-vue';
 import dayjs from 'dayjs';
 
-import {   
+import {
   useVbenVxeGrid,
   vxeCheckboxChecked,
-  type VxeGridProps 
+  type VxeGridProps
 } from '#/adapter/vxe-table';
 
 import {
@@ -118,8 +118,7 @@ function handleMultiDelete() {
 }
 
 function handleDownloadExcel() {
-  commonDownloadExcel(cityAreaExport, '行政区划
-数据', tableApi.formApi.form.values, {
+  commonDownloadExcel(cityAreaExport, '行政区划数据', tableApi.formApi.form.values, {
     fieldMappingTime: formOptions.fieldMappingTime,
   });
 }
@@ -140,8 +139,8 @@ function handleDownloadExcel() {
           <a-button
             :disabled="!vxeCheckboxChecked(tableApi)"
             danger
-            type="primary" 
-            v-access:code="['property:cityArea:remove']" 
+            type="primary"
+            v-access:code="['property:cityArea:remove']"
             @click="handleMultiDelete">
             {{ $t('pages.common.delete') }}
           </a-button>
diff --git a/apps/web-antd/src/views/property/community/data.ts b/apps/web-antd/src/views/property/community/data.ts
index 642a9c59..a66ba360 100644
--- a/apps/web-antd/src/views/property/community/data.ts
+++ b/apps/web-antd/src/views/property/community/data.ts
@@ -69,12 +69,26 @@ export const querySchema: FormSchemaGetter = () => [
     fieldName: 'dataState',
     label: '数据状态：1有效，0无效',
   },
+  {
+    component: 'DatePicker',
+    componentProps: {
+      showTime: true,
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+    },
+    fieldName: 'modifyTime',
+    label: '修改时间',
+  },
 ];
 
 // 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
 // export const columns: () => VxeGridProps['columns'] = () => [
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
+  {
+    title: '主键',
+    field: 'id',
+  },
   {
     title: '社区名称',
     field: 'communityName',
@@ -125,6 +139,14 @@ export const columns: VxeGridProps['columns'] = [
     title: '组织编码',
     field: 'orgCode',
   },
+  {
+    title: '数据状态：1有效，0无效',
+    field: 'dataState',
+  },
+  {
+    title: '修改时间',
+    field: 'modifyTime',
+  },
   {
     field: 'action',
     fixed: 'right',
@@ -136,7 +158,7 @@ export const columns: VxeGridProps['columns'] = [
 
 export const modalSchema: FormSchemaGetter = () => [
   {
-    label: '主键id',
+    label: '主键',
     fieldName: 'id',
     component: 'Input',
     dependencies: {
@@ -217,4 +239,20 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'Input',
     rules: 'required',
   },
+  {
+    label: '数据状态：1有效，0无效',
+    fieldName: 'dataState',
+    component: 'Input',
+    rules: 'required',
+  },
+  {
+    label: '修改时间',
+    fieldName: 'modifyTime',
+    component: 'DatePicker',
+    componentProps: {
+      showTime: true,
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+    },
+  },
 ];
diff --git a/apps/web-antd/src/views/property/deviceType/data.ts b/apps/web-antd/src/views/property/deviceType/data.ts
index 3a3ea9bb..4ac753da 100644
--- a/apps/web-antd/src/views/property/deviceType/data.ts
+++ b/apps/web-antd/src/views/property/deviceType/data.ts
@@ -29,6 +29,10 @@ export const querySchema: FormSchemaGetter = () => [
 // export const columns: () => VxeGridProps['columns'] = () => [
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
+  {
+    title: '主键',
+    field: 'id',
+  },
   {
     title: '设备类型编码',
     field: 'dvNo',
@@ -60,7 +64,7 @@ export const columns: VxeGridProps['columns'] = [
 
 export const modalSchema: FormSchemaGetter = () => [
   {
-    label: '数据库id',
+    label: '主键',
     fieldName: 'id',
     component: 'Input',
     dependencies: {
diff --git a/apps/web-antd/src/views/property/e8Config/data.ts b/apps/web-antd/src/views/property/e8Config/data.ts
index 7548127e..c862e2d2 100644
--- a/apps/web-antd/src/views/property/e8Config/data.ts
+++ b/apps/web-antd/src/views/property/e8Config/data.ts
@@ -34,6 +34,10 @@ export const querySchema: FormSchemaGetter = () => [
 // export const columns: () => VxeGridProps['columns'] = () => [
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
+  {
+    title: '主键',
+    field: 'id',
+  },
   {
     title: 'E8 名称',
     field: 'e8Name',
@@ -50,6 +54,10 @@ export const columns: VxeGridProps['columns'] = [
     title: '组织编码',
     field: 'orgCode',
   },
+  {
+    title: '数据状态：1有效，0无效',
+    field: 'dataState',
+  },
   {
     field: 'action',
     fixed: 'right',
@@ -61,7 +69,7 @@ export const columns: VxeGridProps['columns'] = [
 
 export const modalSchema: FormSchemaGetter = () => [
   {
-    label: 'ID',
+    label: '主键',
     fieldName: 'id',
     component: 'Input',
     dependencies: {
@@ -93,4 +101,10 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'Input',
     rules: 'required',
   },
+  {
+    label: '数据状态：1有效，0无效',
+    fieldName: 'dataState',
+    component: 'Input',
+    rules: 'required',
+  },
 ];
diff --git a/apps/web-antd/src/views/property/factory/data.ts b/apps/web-antd/src/views/property/factory/data.ts
index 083f1d12..b32215af 100644
--- a/apps/web-antd/src/views/property/factory/data.ts
+++ b/apps/web-antd/src/views/property/factory/data.ts
@@ -18,12 +18,21 @@ export const querySchema: FormSchemaGetter = () => [
     fieldName: 'dataState',
     label: '数据状态：1有效，0无效',
   },
+  {
+    component: 'Input',
+    fieldName: 'searchValue',
+    label: '搜索值',
+  },
 ];
 
 // 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
 // export const columns: () => VxeGridProps['columns'] = () => [
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
+  {
+    title: '',
+    field: 'id',
+  },
   {
     title: '厂商编码',
     field: 'factoryNo',
@@ -40,6 +49,10 @@ export const columns: VxeGridProps['columns'] = [
     title: '数据状态：1有效，0无效',
     field: 'dataState',
   },
+  {
+    title: '搜索值',
+    field: 'searchValue',
+  },
   {
     field: 'action',
     fixed: 'right',
@@ -51,7 +64,7 @@ export const columns: VxeGridProps['columns'] = [
 
 export const modalSchema: FormSchemaGetter = () => [
   {
-    label: '数据库id',
+    label: '',
     fieldName: 'id',
     component: 'Input',
     dependencies: {
@@ -59,6 +72,12 @@ export const modalSchema: FormSchemaGetter = () => [
       triggerFields: [''],
     },
   },
+  {
+    label: '厂商编码',
+    fieldName: 'factoryNo',
+    component: 'Input',
+    rules: 'required',
+  },
   {
     label: '设备厂商名称',
     fieldName: 'factoryName',
@@ -76,4 +95,9 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'Input',
     rules: 'required',
   },
+  {
+    label: '搜索值',
+    fieldName: 'searchValue',
+    component: 'Input',
+  },
 ];
diff --git a/apps/web-antd/src/views/property/floor/data.ts b/apps/web-antd/src/views/property/floor/data.ts
index 57493b31..3a4cd035 100644
--- a/apps/web-antd/src/views/property/floor/data.ts
+++ b/apps/web-antd/src/views/property/floor/data.ts
@@ -33,36 +33,12 @@ export const querySchema: FormSchemaGetter = () => [
     fieldName: 'dataState',
     label: '数据状态：1有效，0无效',
   },
-  {
-    component: 'Input',
-    fieldName: 'createEmpId',
-    label: '创建人',
-  },
-  {
-    component: 'DatePicker',
-    componentProps: {
-      showTime: true,
-      format: 'YYYY-MM-DD HH:mm:ss',
-      valueFormat: 'YYYY-MM-DD HH:mm:ss',
-    },
-    fieldName: 'modifyTime',
-    label: '修改时间',
-  },
-  {
-    component: 'Input',
-    fieldName: 'searchValue',
-    label: '搜索值',
-  },
 ];
 
 // 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
 // export const columns: () => VxeGridProps['columns'] = () => [
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
-  {
-    title: '',
-    field: 'id',
-  },
   {
     title: '社区编码',
     field: 'communityCode',
@@ -83,22 +59,6 @@ export const columns: VxeGridProps['columns'] = [
     title: '组织编码',
     field: 'orgCode',
   },
-  {
-    title: '数据状态：1有效，0无效',
-    field: 'dataState',
-  },
-  {
-    title: '创建人',
-    field: 'createEmpId',
-  },
-  {
-    title: '修改时间',
-    field: 'modifyTime',
-  },
-  {
-    title: '搜索值',
-    field: 'searchValue',
-  },
   {
     field: 'action',
     fixed: 'right',
@@ -110,7 +70,7 @@ export const columns: VxeGridProps['columns'] = [
 
 export const modalSchema: FormSchemaGetter = () => [
   {
-    label: '',
+    label: 'ID',
     fieldName: 'id',
     component: 'Input',
     dependencies: {
@@ -148,29 +108,4 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'Input',
     rules: 'required',
   },
-  {
-    label: '数据状态：1有效，0无效',
-    fieldName: 'dataState',
-    component: 'Input',
-  },
-  {
-    label: '创建人',
-    fieldName: 'createEmpId',
-    component: 'Input',
-  },
-  {
-    label: '修改时间',
-    fieldName: 'modifyTime',
-    component: 'DatePicker',
-    componentProps: {
-      showTime: true,
-      format: 'YYYY-MM-DD HH:mm:ss',
-      valueFormat: 'YYYY-MM-DD HH:mm:ss',
-    },
-  },
-  {
-    label: '搜索值',
-    fieldName: 'searchValue',
-    component: 'Input',
-  },
 ];
diff --git a/apps/web-antd/src/views/property/roomBooking/data.ts b/apps/web-antd/src/views/property/roomBooking/data.ts
index ce0f794d..8cc702fd 100644
--- a/apps/web-antd/src/views/property/roomBooking/data.ts
+++ b/apps/web-antd/src/views/property/roomBooking/data.ts
@@ -116,8 +116,8 @@ export const querySchema: FormSchemaGetter = () => [
   {
     component: 'RadioGroup',
     componentProps: {
-      // 可选从DictEnum中获取 DictEnum.SYS_YES_NO 便于维护
-      options: getDictOptions('sys_yes_no'),
+      // 可选从DictEnum中获取 DictEnum.WY_SF 便于维护
+      options: getDictOptions('wy_sf'),
       buttonStyle: 'solid',
       optionType: 'button',
     },
@@ -207,8 +207,8 @@ export const columns: VxeGridProps['columns'] = [
     field: 'addServices',
     slots: {
       default: ({ row }) => {
-        // 可选从DictEnum中获取 DictEnum.SYS_YES_NO 便于维护
-        return renderDict(row.addServices, 'sys_yes_no');
+        // 可选从DictEnum中获取 DictEnum.WY_SF 便于维护
+        return renderDict(row.addServices, 'wy_sf');
       },
     },
   },
@@ -359,8 +359,8 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'addServices',
     component: 'RadioGroup',
     componentProps: {
-      // 可选从DictEnum中获取 DictEnum.SYS_YES_NO 便于维护
-      options: getDictOptions('sys_yes_no'),
+      // 可选从DictEnum中获取 DictEnum.WY_SF 便于维护
+      options: getDictOptions('wy_sf'),
       buttonStyle: 'solid',
       optionType: 'button',
     },
diff --git a/apps/web-antd/src/views/property/visitorManagement/data.ts b/apps/web-antd/src/views/property/visitorManagement/data.ts
index c58e04af..0b97c33c 100644
--- a/apps/web-antd/src/views/property/visitorManagement/data.ts
+++ b/apps/web-antd/src/views/property/visitorManagement/data.ts
@@ -68,6 +68,10 @@ export const querySchema: FormSchemaGetter = () => [
 // export const columns: () => VxeGridProps['columns'] = () => [
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
+  {
+    title: 'id',
+    field: 'id',
+  },
   {
     title: '访客姓名',
     field: 'visitorName',