diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/controller/admin/PropertyDealController.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/controller/admin/PropertyDealController.java
index 01cba850..5163e227 100644
--- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/controller/admin/PropertyDealController.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/controller/admin/PropertyDealController.java
@@ -5,7 +5,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.module.property.entity.PropertyDealDO;
+import cn.iocoder.yudao.module.property.entity.PropertyDeal;
 import cn.iocoder.yudao.module.property.service.PropertyDealService;
 import cn.iocoder.yudao.module.property.vo.PropertyDealReqVO;
 import cn.iocoder.yudao.module.property.vo.PropertyDealRespVO;
@@ -63,7 +63,7 @@ public class PropertyDealController {
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('company:property-deal:query')")
     public CommonResult<PropertyDealRespVO> getPropertyDeal(@RequestParam("id") String id) {
-        PropertyDealDO propertyDeal = propertyDealService.getPropertyDeal(id);
+        PropertyDeal propertyDeal = propertyDealService.getPropertyDeal(id);
         return success(BeanUtils.toBean(propertyDeal, PropertyDealRespVO.class));
     }
 
diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/controller/admin/PropertyDealItemController.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/controller/admin/PropertyDealItemController.java
index e55e75b2..3f706330 100644
--- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/controller/admin/PropertyDealItemController.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/controller/admin/PropertyDealItemController.java
@@ -5,7 +5,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.module.property.entity.PropertyDealItemDO;
+import cn.iocoder.yudao.module.property.entity.PropertyDealItem;
 import cn.iocoder.yudao.module.property.service.PropertyDealItemService;
 import cn.iocoder.yudao.module.property.vo.PropertyDealItemReqVO;
 import cn.iocoder.yudao.module.property.vo.PropertyDealItemRespVO;
@@ -63,7 +63,7 @@ public class PropertyDealItemController {
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('company:property-deal-item:query')")
     public CommonResult<PropertyDealItemRespVO> getPropertyDealItem(@RequestParam("id") String id) {
-        PropertyDealItemDO propertyDealItem = propertyDealItemService.getPropertyDealItem(id);
+        PropertyDealItem propertyDealItem = propertyDealItemService.getPropertyDealItem(id);
         return success(BeanUtils.toBean(propertyDealItem, PropertyDealItemRespVO.class));
     }
 
diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/controller/admin/PropertyPosController.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/controller/admin/PropertyPosController.java
index 42eb15f2..c61a9d15 100644
--- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/controller/admin/PropertyPosController.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/controller/admin/PropertyPosController.java
@@ -5,11 +5,14 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.module.property.entity.PropertyPosDO;
+import cn.iocoder.yudao.module.property.entity.PropertyPos;
 import cn.iocoder.yudao.module.property.service.PropertyPosService;
 import cn.iocoder.yudao.module.property.vo.PropertyPosReqVO;
 import cn.iocoder.yudao.module.property.vo.PropertyPosRespVO;
+import cn.iocoder.yudao.module.staff.entity.CompanyStaff;
+import cn.iocoder.yudao.module.staff.vo.CompanyStaffReqVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -63,28 +66,18 @@ public class PropertyPosController {
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('company:property-pos:query')")
     public CommonResult<PropertyPosRespVO> getPropertyPos(@RequestParam("id") String id) {
-        PropertyPosDO propertyPos = propertyPosService.getPropertyPos(id);
+        PropertyPos propertyPos = propertyPosService.getPropertyPos(id);
         return success(BeanUtils.toBean(propertyPos, PropertyPosRespVO.class));
     }
 
     @GetMapping("/page")
     @Operation(summary = "获得企业管理-资产存放位置分页")
     @PreAuthorize("@ss.hasPermission('company:property-pos:query')")
-    public CommonResult<IPage<PropertyPosRespVO>> getPropertyPosPage(PropertyPosReqVO pageReqVO) {
-        IPage<PropertyPosRespVO> pageResult = propertyPosService.getPropertyPosPage(pageReqVO);
-        return success(pageResult);
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出企业管理-资产存放位置 Excel")
-    @PreAuthorize("@ss.hasPermission('company:property-pos:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public void exportPropertyPosExcel(PropertyPosReqVO pageReqVO,
-                                       HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<PropertyPosRespVO> list = propertyPosService.getPropertyPosPage(pageReqVO).getRecords();
-        // 导出 Excel
-        ExcelUtils.write(response, "企业管理-资产存放位置.xls", "数据", PropertyPosRespVO.class,list);
+    public CommonResult<IPage<?>> getPropertyPosPage(PropertyPosReqVO pageReqVO,
+                                                      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+        Page<PropertyPos> page = new Page<>(pageNo, pageSize);
+        return success(propertyPosService.getPropertyPosPage( page,pageReqVO));
     }
 
 }
\ No newline at end of file
diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/PropertyDealDO.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/PropertyDeal.java
similarity index 96%
rename from dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/PropertyDealDO.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/PropertyDeal.java
index 171e6742..240da783 100644
--- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/PropertyDealDO.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/PropertyDeal.java
@@ -22,7 +22,7 @@ import java.time.LocalDate;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class PropertyDealDO extends BaseDO {
+public class PropertyDeal extends BaseDO {
 
     /**
      * 主键标识
diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/PropertyDealItemDO.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/PropertyDealItem.java
similarity index 97%
rename from dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/PropertyDealItemDO.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/PropertyDealItem.java
index 1d5419da..c70fae85 100644
--- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/PropertyDealItemDO.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/PropertyDealItem.java
@@ -20,7 +20,7 @@ import lombok.*;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class PropertyDealItemDO extends BaseDO {
+public class PropertyDealItem extends BaseDO {
 
     /**
      * 主键标识
diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/PropertyPosDO.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/PropertyPos.java
similarity index 90%
rename from dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/PropertyPosDO.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/PropertyPos.java
index f387edd8..026fc0f3 100644
--- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/PropertyPosDO.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/PropertyPos.java
@@ -22,7 +22,7 @@ import java.math.BigDecimal;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class PropertyPosDO extends TenantBaseDO {
+public class PropertyPos extends TenantBaseDO {
 
     /**
      * 主键标识
@@ -50,9 +50,7 @@ public class PropertyPosDO extends TenantBaseDO {
      */
     private BigDecimal area;
     /**
-     * 存放类型
-     *
-     * 枚举 {@link TODO company_deposit_type 对应的类}
+     * 存放类型-数据字典 company_deposit_type
      */
     private String depositType;
 
diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/mapper/PropertyDealItemMapper.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/mapper/PropertyDealItemMapper.java
index 99c42e7e..423bdf78 100644
--- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/mapper/PropertyDealItemMapper.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/mapper/PropertyDealItemMapper.java
@@ -1,6 +1,6 @@
 package cn.iocoder.yudao.module.property.mapper;
 
-import cn.iocoder.yudao.module.property.entity.PropertyDealItemDO;
+import cn.iocoder.yudao.module.property.entity.PropertyDealItem;
 import cn.iocoder.yudao.module.property.vo.PropertyDealItemReqVO;
 import cn.iocoder.yudao.module.property.vo.PropertyDealItemRespVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @author 后台管理员
  */
 @Mapper
-public interface PropertyDealItemMapper extends BaseMapper<PropertyDealItemDO> {
+public interface PropertyDealItemMapper extends BaseMapper<PropertyDealItem> {
 
     default IPage<PropertyDealItemRespVO> selectPage(PropertyDealItemReqVO reqVO) {
         return null;
diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/mapper/PropertyDealMapper.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/mapper/PropertyDealMapper.java
index 47517b03..fff5f4dc 100644
--- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/mapper/PropertyDealMapper.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/mapper/PropertyDealMapper.java
@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.property.mapper;
 
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.property.entity.PropertyDealDO;
+import cn.iocoder.yudao.module.property.entity.PropertyDeal;
 import cn.iocoder.yudao.module.property.vo.PropertyDealReqVO;
 import cn.iocoder.yudao.module.property.vo.PropertyDealRespVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @author 后台管理员
  */
 @Mapper
-public interface PropertyDealMapper extends BaseMapperX<PropertyDealDO> {
+public interface PropertyDealMapper extends BaseMapperX<PropertyDeal> {
 
     default IPage<PropertyDealRespVO> selectPage(PropertyDealReqVO reqVO) {
         return null;
diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/mapper/PropertyPosMapper.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/mapper/PropertyPosMapper.java
index 827ffddc..c4ae7003 100644
--- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/mapper/PropertyPosMapper.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/mapper/PropertyPosMapper.java
@@ -1,11 +1,16 @@
 package cn.iocoder.yudao.module.property.mapper;
 
-import cn.iocoder.yudao.module.property.entity.PropertyPosDO;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.property.entity.PropertyPos;
 import cn.iocoder.yudao.module.property.vo.PropertyPosReqVO;
 import cn.iocoder.yudao.module.property.vo.PropertyPosRespVO;
+import cn.iocoder.yudao.module.staff.entity.CompanyStaff;
+import cn.iocoder.yudao.module.staff.vo.CompanyStaffReqVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 企业管理-资产存放位置 Mapper
@@ -13,10 +18,16 @@ import org.apache.ibatis.annotations.Mapper;
  * @author vinjor-m
  */
 @Mapper
-public interface PropertyPosMapper extends BaseMapper<PropertyPosDO> {
+public interface PropertyPosMapper extends BaseMapper<PropertyPos> {
 
-    default IPage<PropertyPosRespVO> selectPage(PropertyPosReqVO reqVO) {
-        return null;
-    }
+    /**
+     * 分页查询
+     * @author vinjor-M
+     * @date 11:43 2024/8/14
+     * @param propertyPosReqVO 查询条件
+     * @param page 分页对象
+     * @return com.baomidou.mybatisplus.core.metadata.IPage<cn.iocoder.yudao.module.property.vo.PropertyPosRespVO>
+    **/
+    IPage<PropertyPosRespVO> selectListPage(Page<PropertyPos> page,@Param("map") PropertyPosReqVO propertyPosReqVO);
 
 }
\ No newline at end of file
diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/PropertyDealItemService.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/PropertyDealItemService.java
index 1294266d..8f15a977 100644
--- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/PropertyDealItemService.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/PropertyDealItemService.java
@@ -1,6 +1,6 @@
 package cn.iocoder.yudao.module.property.service;
 
-import cn.iocoder.yudao.module.property.entity.PropertyDealItemDO;
+import cn.iocoder.yudao.module.property.entity.PropertyDealItem;
 import cn.iocoder.yudao.module.property.vo.PropertyDealItemReqVO;
 import cn.iocoder.yudao.module.property.vo.PropertyDealItemRespVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  *
  * @author 后台管理员
  */
-public interface PropertyDealItemService extends IService<PropertyDealItemDO> {
+public interface PropertyDealItemService extends IService<PropertyDealItem> {
 
     /**
      * 创建企业管理-资产处置子
@@ -42,7 +42,7 @@ public interface PropertyDealItemService extends IService<PropertyDealItemDO> {
      * @param id 编号
      * @return 企业管理-资产处置子
      */
-    PropertyDealItemDO getPropertyDealItem(String id);
+    PropertyDealItem getPropertyDealItem(String id);
 
     /**
      * 获得企业管理-资产处置子分页
diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/PropertyDealService.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/PropertyDealService.java
index c6bac6a6..834efe00 100644
--- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/PropertyDealService.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/PropertyDealService.java
@@ -1,6 +1,6 @@
 package cn.iocoder.yudao.module.property.service;
 
-import cn.iocoder.yudao.module.property.entity.PropertyDealDO;
+import cn.iocoder.yudao.module.property.entity.PropertyDeal;
 import cn.iocoder.yudao.module.property.vo.PropertyDealReqVO;
 import cn.iocoder.yudao.module.property.vo.PropertyDealRespVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  *
  * @author 后台管理员
  */
-public interface PropertyDealService extends IService<PropertyDealDO> {
+public interface PropertyDealService extends IService<PropertyDeal> {
 
     /**
      * 创建企业管理-资产处置单/变动单
@@ -41,7 +41,7 @@ public interface PropertyDealService extends IService<PropertyDealDO> {
      * @param id 编号
      * @return 企业管理-资产处置单/变动单
      */
-    PropertyDealDO getPropertyDeal(String id);
+    PropertyDeal getPropertyDeal(String id);
 
     /**
      * 获得企业管理-资产处置单/变动单分页
diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/PropertyPosService.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/PropertyPosService.java
index 75fffecc..88c617d3 100644
--- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/PropertyPosService.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/PropertyPosService.java
@@ -1,9 +1,11 @@
 package cn.iocoder.yudao.module.property.service;
 
-import cn.iocoder.yudao.module.property.entity.PropertyPosDO;
+import cn.iocoder.yudao.module.property.entity.PropertyPos;
 import cn.iocoder.yudao.module.property.vo.PropertyPosReqVO;
 import cn.iocoder.yudao.module.property.vo.PropertyPosRespVO;
+import cn.iocoder.yudao.module.staff.entity.CompanyStaff;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -11,7 +13,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  *
  * @author vinjor-m
  */
-public interface PropertyPosService extends IService<PropertyPosDO> {
+public interface PropertyPosService extends IService<PropertyPos> {
 
     /**
      * 创建企业管理-资产存放位置
@@ -41,7 +43,7 @@ public interface PropertyPosService extends IService<PropertyPosDO> {
      * @param id 编号
      * @return 企业管理-资产存放位置
      */
-    PropertyPosDO getPropertyPos(String id);
+    PropertyPos getPropertyPos(String id);
 
     /**
      * 获得企业管理-资产存放位置分页
@@ -49,6 +51,6 @@ public interface PropertyPosService extends IService<PropertyPosDO> {
      * @param pageReqVO 分页查询
      * @return 企业管理-资产存放位置分页
      */
-    IPage<PropertyPosRespVO> getPropertyPosPage(PropertyPosReqVO pageReqVO);
+    IPage<PropertyPosRespVO> getPropertyPosPage(Page<PropertyPos> page,PropertyPosReqVO pageReqVO);
 
 }
\ No newline at end of file
diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/impl/PropertyDealItemServiceImpl.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/impl/PropertyDealItemServiceImpl.java
index 14edc399..7d2216fa 100644
--- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/impl/PropertyDealItemServiceImpl.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/impl/PropertyDealItemServiceImpl.java
@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.property.service.impl;
 
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.property.entity.PropertyDealItemDO;
+import cn.iocoder.yudao.module.property.entity.PropertyDealItem;
 import cn.iocoder.yudao.module.property.mapper.PropertyDealItemMapper;
 import cn.iocoder.yudao.module.property.service.PropertyDealItemService;
 import cn.iocoder.yudao.module.property.vo.PropertyDealItemReqVO;
@@ -18,12 +18,12 @@ import org.springframework.validation.annotation.Validated;
  */
 @Service
 @Validated
-public class PropertyDealItemServiceImpl extends ServiceImpl<PropertyDealItemMapper, PropertyDealItemDO> implements PropertyDealItemService {
+public class PropertyDealItemServiceImpl extends ServiceImpl<PropertyDealItemMapper, PropertyDealItem> implements PropertyDealItemService {
 
     @Override
     public String createPropertyDealItem(PropertyDealItemReqVO createReqVO) {
         // 插入
-        PropertyDealItemDO propertyDealItem = BeanUtils.toBean(createReqVO, PropertyDealItemDO.class);
+        PropertyDealItem propertyDealItem = BeanUtils.toBean(createReqVO, PropertyDealItem.class);
         baseMapper.insert(propertyDealItem);
         // 返回
         return propertyDealItem.getId();
@@ -32,7 +32,7 @@ public class PropertyDealItemServiceImpl extends ServiceImpl<PropertyDealItemMap
     @Override
     public void updatePropertyDealItem(PropertyDealItemReqVO updateReqVO) {
         // 更新
-        PropertyDealItemDO updateObj = BeanUtils.toBean(updateReqVO, PropertyDealItemDO.class);
+        PropertyDealItem updateObj = BeanUtils.toBean(updateReqVO, PropertyDealItem.class);
         baseMapper.updateById(updateObj);
     }
 
@@ -44,7 +44,7 @@ public class PropertyDealItemServiceImpl extends ServiceImpl<PropertyDealItemMap
     
 
     @Override
-    public PropertyDealItemDO getPropertyDealItem(String id) {
+    public PropertyDealItem getPropertyDealItem(String id) {
         return baseMapper.selectById(id);
     }
 
diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/impl/PropertyDealServiceImpl.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/impl/PropertyDealServiceImpl.java
index 78b7209a..eb7d1e51 100644
--- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/impl/PropertyDealServiceImpl.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/impl/PropertyDealServiceImpl.java
@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.property.service.impl;
 
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.property.entity.PropertyDealDO;
+import cn.iocoder.yudao.module.property.entity.PropertyDeal;
 import cn.iocoder.yudao.module.property.mapper.PropertyDealMapper;
 import cn.iocoder.yudao.module.property.service.PropertyDealService;
 import cn.iocoder.yudao.module.property.vo.PropertyDealReqVO;
@@ -19,12 +19,12 @@ import org.springframework.validation.annotation.Validated;
  */
 @Service
 @Validated
-public class PropertyDealServiceImpl extends ServiceImpl<PropertyDealMapper,PropertyDealDO> implements PropertyDealService {
+public class PropertyDealServiceImpl extends ServiceImpl<PropertyDealMapper, PropertyDeal> implements PropertyDealService {
 
     @Override
     public String createPropertyDeal(PropertyDealReqVO createReqVO) {
         // 插入
-        PropertyDealDO propertyDeal = BeanUtils.toBean(createReqVO, PropertyDealDO.class);
+        PropertyDeal propertyDeal = BeanUtils.toBean(createReqVO, PropertyDeal.class);
         baseMapper.insert(propertyDeal);
         // 返回
         return propertyDeal.getId();
@@ -33,7 +33,7 @@ public class PropertyDealServiceImpl extends ServiceImpl<PropertyDealMapper,Prop
     @Override
     public void updatePropertyDeal(PropertyDealReqVO updateReqVO) {
         // 更新
-        PropertyDealDO updateObj = BeanUtils.toBean(updateReqVO, PropertyDealDO.class);
+        PropertyDeal updateObj = BeanUtils.toBean(updateReqVO, PropertyDeal.class);
         baseMapper.updateById(updateObj);
     }
 
@@ -45,7 +45,7 @@ public class PropertyDealServiceImpl extends ServiceImpl<PropertyDealMapper,Prop
 
 
     @Override
-    public PropertyDealDO getPropertyDeal(String id) {
+    public PropertyDeal getPropertyDeal(String id) {
         return baseMapper.selectById(id);
     }
 
diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/impl/PropertyPosServiceImpl.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/impl/PropertyPosServiceImpl.java
index 49f36822..f510081c 100644
--- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/impl/PropertyPosServiceImpl.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/impl/PropertyPosServiceImpl.java
@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.property.service.impl;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
-import cn.iocoder.yudao.module.property.entity.PropertyPosDO;
+import cn.iocoder.yudao.module.property.entity.PropertyPos;
 import cn.iocoder.yudao.module.property.mapper.PropertyPosMapper;
 import cn.iocoder.yudao.module.property.service.PropertyPosService;
 import cn.iocoder.yudao.module.property.vo.PropertyPosReqVO;
@@ -11,6 +11,7 @@ import cn.iocoder.yudao.module.property.vo.PropertyPosRespVO;
 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
 import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -21,7 +22,6 @@ import javax.annotation.Resource;
 import static cn.iocoder.yudao.common.ErrorCodeConstants.PROPERTY_NO_CORP;
 import static cn.iocoder.yudao.common.ErrorCodeConstants.PROPERTY_NO_DEPT;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.USER_COUNT_MAX;
 
 /**
  * 企业管理-资产存放位置 Service 实现类
@@ -30,9 +30,11 @@ import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.USER_COUNT
  */
 @Service
 @Validated
-public class PropertyPosServiceImpl extends ServiceImpl<PropertyPosMapper, PropertyPosDO> implements PropertyPosService {
+public class PropertyPosServiceImpl extends ServiceImpl<PropertyPosMapper, PropertyPos> implements PropertyPosService {
     @Resource
     private DeptApi deptApi;
+    @Resource
+    private PropertyPosMapper propertyPosMapper;
 
     @Override
     public String createPropertyPos(PropertyPosReqVO createReqVO) {
@@ -53,7 +55,7 @@ public class PropertyPosServiceImpl extends ServiceImpl<PropertyPosMapper, Prope
             createReqVO.setCorpId(deptRespDTO.getCorpId());
         }
         /* 2.插入数据并反回Id*/
-        PropertyPosDO propertyPos = BeanUtils.toBean(createReqVO, PropertyPosDO.class);
+        PropertyPos propertyPos = BeanUtils.toBean(createReqVO, PropertyPos.class);
         baseMapper.insert(propertyPos);
         // 返回
         return propertyPos.getId();
@@ -62,7 +64,7 @@ public class PropertyPosServiceImpl extends ServiceImpl<PropertyPosMapper, Prope
     @Override
     public void updatePropertyPos(PropertyPosReqVO updateReqVO) {
         // 更新
-        PropertyPosDO updateObj = BeanUtils.toBean(updateReqVO, PropertyPosDO.class);
+        PropertyPos updateObj = BeanUtils.toBean(updateReqVO, PropertyPos.class);
         baseMapper.updateById(updateObj);
     }
 
@@ -75,13 +77,13 @@ public class PropertyPosServiceImpl extends ServiceImpl<PropertyPosMapper, Prope
 
 
     @Override
-    public PropertyPosDO getPropertyPos(String id) {
+    public PropertyPos getPropertyPos(String id) {
         return baseMapper.selectById(id);
     }
 
     @Override
-    public IPage<PropertyPosRespVO> getPropertyPosPage(PropertyPosReqVO pageReqVO) {
-        return baseMapper.selectPage(pageReqVO);
+    public IPage<PropertyPosRespVO> getPropertyPosPage(Page<PropertyPos> page, PropertyPosReqVO pageReqVO) {
+        return propertyPosMapper.selectListPage(page,pageReqVO);
     }
 
 }
\ No newline at end of file
diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyDealItemRespVO.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyDealItemRespVO.java
index 98a003bd..e07d89f7 100644
--- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyDealItemRespVO.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyDealItemRespVO.java
@@ -1,6 +1,6 @@
 package cn.iocoder.yudao.module.property.vo;
 
-import cn.iocoder.yudao.module.property.entity.PropertyDealItemDO;
+import cn.iocoder.yudao.module.property.entity.PropertyDealItem;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -11,7 +11,7 @@ import java.time.LocalDateTime;
 @Schema(description = "管理后台 - 企业管理-资产处置子 Response VO")
 @Data
 @ExcelIgnoreUnannotated
-public class PropertyDealItemRespVO extends PropertyDealItemDO {
+public class PropertyDealItemRespVO extends PropertyDealItem {
 
     @Schema(description = "创建时间")
     @ExcelProperty("创建时间")
diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyDealRespVO.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyDealRespVO.java
index b2f21783..b0c31349 100644
--- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyDealRespVO.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyDealRespVO.java
@@ -1,6 +1,6 @@
 package cn.iocoder.yudao.module.property.vo;
 
-import cn.iocoder.yudao.module.property.entity.PropertyDealDO;
+import cn.iocoder.yudao.module.property.entity.PropertyDeal;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -11,7 +11,7 @@ import java.time.LocalDateTime;
 @Schema(description = "管理后台 - 企业管理-资产处置单/变动单 Response VO")
 @Data
 @ExcelIgnoreUnannotated
-public class PropertyDealRespVO extends PropertyDealDO {
+public class PropertyDealRespVO extends PropertyDeal {
 
     @Schema(description = "创建时间")
     @ExcelProperty("创建时间")
diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyPosReqVO.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyPosReqVO.java
index 89c9a724..b4ad3578 100644
--- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyPosReqVO.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyPosReqVO.java
@@ -1,46 +1,17 @@
 package cn.iocoder.yudao.module.property.vo;
 
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.module.property.entity.PropertyPos;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
-import org.springframework.format.annotation.DateTimeFormat;
 
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
 
 @Schema(description = "管理后台 - 企业管理-资产存放位置分页 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class PropertyPosReqVO extends PageParam {
+public class PropertyPosReqVO extends PropertyPos {
 
-    @Schema(description = "主键标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "18095")
-    private String id;
-
-    @Schema(description = "企业id（base_company表中的id）", example = "5018")
-    private String corpId;
-
-    @Schema(description = "部门id（system_dept表中的id，用来做数据权限控制）", example = "25943")
-    private Long deptId;
-
-    @Schema(description = "存放地名称", example = "王五")
-    private String posName;
-
-    @Schema(description = "存放地地址")
-    private String address;
-
-    @Schema(description = "面积")
-    private BigDecimal area;
-
-    @Schema(description = "存放类型", example = "2")
-    private String depositType;
-
-    @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    private LocalDateTime createTime;
 
 }
\ No newline at end of file
diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyPosRespVO.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyPosRespVO.java
index e85930c9..5dec00a8 100644
--- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyPosRespVO.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyPosRespVO.java
@@ -1,20 +1,17 @@
 package cn.iocoder.yudao.module.property.vo;
 
-import cn.iocoder.yudao.module.property.entity.PropertyPosDO;
+import cn.iocoder.yudao.module.property.entity.PropertyPos;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.time.LocalDateTime;
-
 @Schema(description = "管理后台 - 企业管理-资产存放位置 Response VO")
 @Data
 @ExcelIgnoreUnannotated
-public class PropertyPosRespVO extends PropertyPosDO {
-
-    @Schema(description = "创建时间")
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
+public class PropertyPosRespVO extends PropertyPos {
+    /**
+     * 企业名称
+     */
+    String corpName;
 
 }
\ No newline at end of file
diff --git a/dl-module-company/src/main/resources/mapper/property/PropertyPosMapper.xml b/dl-module-company/src/main/resources/mapper/property/PropertyPosMapper.xml
index a6db6fd0..8ad8e2c7 100644
--- a/dl-module-company/src/main/resources/mapper/property/PropertyPosMapper.xml
+++ b/dl-module-company/src/main/resources/mapper/property/PropertyPosMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.iocoder.yudao.module.property.dal.mysql.property.PropertyPosMapper">
+<mapper namespace="cn.iocoder.yudao.module.property.mapper.PropertyPosMapper">
 
     <!--
         一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
@@ -8,5 +8,28 @@
         代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
-
+    <sql id="Base_SQL">
+        cpp.id,cpp.corp_id,cpp.dept_id,cpp.pos_name,cpp.address,
+        cpp.area,cpp.deposit_type,cpp.tenant_id,cpp.deleted,
+        cpp.creator,cpp.create_time,cpp.updater,cpp.update_time
+    </sql>
+    <select id="selectListPage" resultType="cn.iocoder.yudao.module.property.vo.PropertyPosRespVO">
+        select
+            <include refid="Base_SQL" />,bc.corp_name
+            FROM company_property_pos cpp
+            LEFT JOIN base_company bc ON cpp.corp_id = bc.id
+        <where>
+            cpp.deleted = 0
+            <if test="map.posName != null and map.posName != ''">
+                AND cpp.pos_name like CONCAT('%', #{map.posName}, '%')
+            </if>
+            <if test="map.address != null and map.address != ''">
+                AND cpp.address like CONCAT('%', #{map.address}, '%')
+            </if>
+            <if test="map.depositType != null and map.depositType != ''">
+                AND cpp.deposit_type like CONCAT('%', #{map.depositType}, '%')
+            </if>
+        </where>
+        ORDER BY cpp.create_time DESC
+    </select>
 </mapper>
\ No newline at end of file