Merge remote-tracking branch 'origin/master'

linwei

2024-01-10 f8d1143ef6cfbbaaebe3b25efa24ee19c9ea61c8

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

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

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 com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;

import java.util.List;

/**
@@ -42,4 +43,5 @@

   List<Integer> getUserLabelList(UserHouseLabelDTO userHouseLabelDTO);

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