From 31b6aefacbee9dde61be6afcb7c6dbbf7c6baa7d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 02 Jan 2024 17:51:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/controller/RegionController.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/RegionController.java b/src/main/java/org/springblade/modules/system/controller/RegionController.java
index 6c5e556..7d061e0 100644
--- a/src/main/java/org/springblade/modules/system/controller/RegionController.java
+++ b/src/main/java/org/springblade/modules/system/controller/RegionController.java
@@ -114,6 +114,15 @@
}
/**
+ * 树列表(包含省市县三级)
+ * @return
+ */
+ @GetMapping("/getBaseTree")
+ public R getBaseTree() {
+ return R.data(regionService.getBaseTree());
+ }
+
+ /**
* 树列表
* @param parentCode
* @return
@@ -124,6 +133,18 @@
return R.data(regionService.getTree(parentCode));
}
+
+ /**
+ * 树列表(获取当前树）
+ * @param code
+ * @return
+ */
+ @GetMapping("/getTownTree")
+ @ApiOperation(value = "树列表", notes = "传入menu")
+ public R getTownTree(String code) {
+ return R.data(regionService.getTownTree(code));
+ }
+
/**
* 新增 行政区划表
*/
--
Gitblit v1.9.3