Merge remote-tracking branch 'origin/master'

linwe

2023-11-22 4b344a457f2c430ca42a3a05a4b53181acada734

 src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java

@@ -238,8 +238,13 @@
      return updateById(houseRental);
   }

   /**
    * 导出租赁信息
    * @param houseRentalVO
    * @return
    */
   @Override
   public List<HouseRentalExcel> export(HouseRentalVO houseRentalVO) {
   public List<HouseRentalExcel> export(HouseRentalTenantVO houseRentalVO) {
      List<HouseRentalExcel> houseRentalExcels = baseMapper.export(houseRentalVO);
      return houseRentalExcels;
   }