From f193d5d14359b882af1ec10daf03dd69b04753b7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Fri, 29 Mar 2024 20:49:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 14 +-------------
1 files changed, 1 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 7874546..030aff1 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -411,19 +411,7 @@
return R.data(userService.getUserInfoByDistrictId(districtId, building));
}
- /**
- * 通过小区id查询用户
- */
- @GetMapping("/getUserInfoByDistrictIds")
- @ApiOperation(value = "通过小区id查询用户")
- public R<IPage<HouseholdVO>> getUserInfoByDistrictIds(@RequestParam("districtIds") String districtIds
- , @RequestParam(value = "building", required = false) String building
- , @RequestParam(value = "unit", required = false) String unit
- , @RequestParam(value = "name", required = false) String name
- , Query query) {
- IPage<HouseholdVO> pages = userService.getUserInfoByDistrictIds(districtIds, building, unit, name, Condition.getPage(query));
- return R.data(pages);
- }
+
/**
--
Gitblit v1.9.3