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

apps/web-antd/src/views/property/equipmentManagement/deviceLocation/data.ts

@@ -42,10 +42,6 @@ export const columns: VxeGridProps['columns'] = [
       },
     },
   },
-  {
-    title: '位置对象',
-    field: 'locationObject',
-  },
   {
     title: '备注',
     field: 'remark',

apps/web-antd/src/views/property/equipmentManagement/deviceLocation/deviceLocation-modal.vue

@@ -105,9 +105,11 @@ const [BasicModal, modalApi] = useVbenModal({
     isUpdate.value = !!id;
     if (isUpdate.value && id) {
       const record = await deviceLocationInfo(id);
+      await setupCommunitySelect(record.locationType);
       record.locationType = record.locationType?.toString();
       await formApi.setValues(record);
     }
+
     await markInitialized();
     modalApi.modalLoading(false);
   },