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/controller/HouseholdController.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/controller/HouseholdController.java b/src/main/java/org/springblade/modules/house/controller/HouseholdController.java
index 44d5415..8392379 100644
--- a/src/main/java/org/springblade/modules/house/controller/HouseholdController.java
+++ b/src/main/java/org/springblade/modules/house/controller/HouseholdController.java
@@ -65,7 +65,6 @@
private final IHouseholdService householdService;
-
/**
* 住户 详情
*/
@@ -107,6 +106,17 @@
public R<IPage<HouseholdVO>> page(HouseholdVO household, Query query) {
IPage<HouseholdVO> pages = householdService.selectHouseholdPage(Condition.getPage(query), household);
return R.data(pages);
+ }
+
+
+ /**
+ * 住户列表查询
+ * @param household
+ * @return
+ */
+ @GetMapping("/selectHouseholdList")
+ public R selectHouseholdList(HouseholdVO household) {
+ return R.data(householdService.selectHouseholdList(household));
}
/**
@@ -232,5 +242,16 @@
return R.data(householdService.userHandle());
}
+ /**
+ * 获取所有住户
+ * @return
+ */
+ @GetMapping("/getAllHouseHold")
+ public R getAllHouseHold(HouseholdVO household) {
+ return R.data(householdService.getAllHouseHold(household));
+ }
+
+
+
}
--
Gitblit v1.9.3