Merge remote-tracking branch 'origin/master'

lin

2024-03-12 02f3b2a577143724b09a70cd13cd3e9256f5fc21

 src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.java

@@ -16,14 +16,16 @@
 */
package org.springblade.modules.house.mapper;

import org.springblade.modules.house.entity.UserHouseLabelEntity;
import org.springblade.modules.house.vo.HouseLabelVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.house.dto.UserHouseLabelDTO;
import org.springblade.modules.house.entity.UserHouseLabelEntity;
import org.springblade.modules.house.vo.HouseholdLabelVO;

import java.util.List;

/**
 * 房屋-标签 Mapper 接口
 * 住户-标签 Mapper 接口
 *
 * @author BladeX
 * @since 2023-10-28
@@ -34,10 +36,14 @@
    * 自定义分页
    *
    * @param page
    * @param houseLabel
    * @param householdLabel
    * @return
    */
   List<HouseLabelVO> selectHouseLabelPage(IPage page, HouseLabelVO houseLabel);
   List<HouseholdLabelVO> selectHouseLabelPage(IPage page, HouseholdLabelVO householdLabel);

   List<Integer> getUserLabelList(UserHouseLabelDTO userHouseLabelDTO);

   List<HouseholdLabelVO> statisticalLabels(IPage page, HouseholdLabelVO householdLabel);

   List<HouseholdLabelVO> getCommunityStatisticalLabels(IPage<HouseholdLabelVO> page, HouseholdLabelVO householdLabel);
}