From 5b4f6ebed74a17dfff13ca18dcf3a19de0b1852e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 03 Apr 2023 19:54:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/RoleController.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/RoleController.java b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/RoleController.java
index 938b1ed..28d04c2 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/RoleController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/RoleController.java
@@ -168,4 +168,14 @@
 		return R.data(list);
 	}
 
+	/**
+	 * 获取所有角色
+	 */
+	@GetMapping("/all")
+	@ApiOperation(value = "获取所有角色")
+	public R<List<Role>> getAll() {
+		List<Role> list = roleService.list();
+		return R.data(list);
+	}
+
 }

--
Gitblit v1.9.3