From 365b5ad817c9c8a2992d505aa39eccfa2be0460e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 09 Nov 2023 09:39:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/label/controller/LabelController.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/label/controller/LabelController.java b/src/main/java/org/springblade/modules/label/controller/LabelController.java
index f95231e..1667af1 100644
--- a/src/main/java/org/springblade/modules/label/controller/LabelController.java
+++ b/src/main/java/org/springblade/modules/label/controller/LabelController.java
@@ -82,6 +82,16 @@
 	}
 
 	/**
+	 * 标签查询,按父id查询下级
+	 * @param label
+	 * @return
+	 */
+	@GetMapping("/getLabelList")
+	public R getLabelList(LabelVO label) {
+		return R.data(labelService.getLabelList(label));
+	}
+
+	/**
 	 * 标签管理 新增
 	 */
 	@PostMapping("/save")

--
Gitblit v1.9.3