From aa237538c7e5f71f92372cc6deda1b1fac2e79e5 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 08 Dec 2023 10:48:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/category/controller/CategoryLabelController.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/category/controller/CategoryLabelController.java b/src/main/java/org/springblade/modules/category/controller/CategoryLabelController.java
index 828df66..974c0b3 100644
--- a/src/main/java/org/springblade/modules/category/controller/CategoryLabelController.java
+++ b/src/main/java/org/springblade/modules/category/controller/CategoryLabelController.java
@@ -122,5 +122,13 @@
 		return R.status(categoryLabelService.removeByIds(Func.toLongList(ids)));
 	}
 
+	/**
+	 * 场所标签临时表 分页
+	 */
+	@GetMapping("/getAllList")
+	public R getAllList(CategoryLabelVO categoryLabel) {
+		return R.data(categoryLabelService.list());
+	}
+
 
 }

--
Gitblit v1.9.3