From 8400a67289b214b83a20484410fff96d236c6d49 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 25 Nov 2023 18:39:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/district/controller/DistrictController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/district/controller/DistrictController.java b/src/main/java/org/springblade/modules/district/controller/DistrictController.java
index 7b97932..322561c 100644
--- a/src/main/java/org/springblade/modules/district/controller/DistrictController.java
+++ b/src/main/java/org/springblade/modules/district/controller/DistrictController.java
@@ -119,7 +119,15 @@
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(districtService.removeByIds(Func.toLongList(ids)));
+ return R.status(districtService.removeByIds(Func.toStrList(ids)));
+ }
+
+ /**
+ * 获取小区树
+ */
+ @GetMapping("/getDistrictTree")
+ public R getDistrictTree(DistrictVO district) {
+ return R.data(districtService.getDistrictTree(district));
}
--
Gitblit v1.9.3