Merge remote-tracking branch 'origin/master'

linwe

2024-05-15 fe81eb39c7402082f54e6aaee491efbcbb1aa50a

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

@@ -18,6 +18,7 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.house.dto.UserHouseLabelDTO;
import org.springblade.modules.house.entity.UserHouseLabelEntity;
import org.springblade.modules.house.vo.HouseholdLabelVO;
@@ -46,4 +47,11 @@
   List<HouseholdLabelVO> statisticalLabels(IPage page, HouseholdLabelVO householdLabel);

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

   /**
    * 查询对应的label集合信息
    * @param labelName
    * @return
    */
    List<UserHouseLabelEntity> getLabelList(@Param("labelNames") String labelName);
}