From f8d1143ef6cfbbaaebe3b25efa24ee19c9ea61c8 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 10 Jan 2024 16:52:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.java |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.java b/src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.java
index 577b85d..9ddcc79 100644
--- a/src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.java
+++ b/src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.java
@@ -16,15 +16,16 @@
  */
 package org.springblade.modules.house.mapper;
 
-import org.springblade.modules.house.dto.UserHouseLabelDTO;
-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
@@ -35,11 +36,12 @@
 	 * 自定义分页
 	 *
 	 * @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<Integer> getUserLabelList(UserHouseLabelDTO userHouseLabelDTO);
+	List<HouseholdLabelVO> statisticalLabels(IPage page, HouseholdLabelVO householdLabel);
 }

--
Gitblit v1.9.3