From 1b8ad0cc6a79f84fb32fdffae39742afa964748e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 24 九月 2024 16:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RoleController.java | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RoleController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RoleController.java
index 93c2c75..fd5851e 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RoleController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RoleController.java
@@ -117,7 +117,6 @@
.filter(role -> role.containsKey("version") && role.get("version").equals(UserExt.getUser().getId()))
.collect(Collectors.toList());
return super.warpObject(new RoleWarpper(filteredRoles));
-
}
return super.warpObject(new RoleWarpper(roles));
}
--
Gitblit v1.7.1