From f147a6ae7f543f6db757b3933adaf8f10b896ccf Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 20 一月 2025 19:23:17 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IRoleService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IRoleService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IRoleService.java
index 19659bb..0a79a58 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IRoleService.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IRoleService.java
@@ -56,7 +56,7 @@
* @return
* @date 2017年2月18日 上午10:32:04
*/
- List<ZTreeNode> roleTreeList();
+ List<ZTreeNode> roleTreeList(Integer type,Integer id);
/**
* 获取角色列表树
@@ -64,5 +64,5 @@
* @return
* @date 2017年2月18日 上午10:32:04
*/
- List<ZTreeNode> roleTreeListByRoleId(String[] roleId);
+ List<ZTreeNode> roleTreeListByRoleId(String[] roleId,Integer type,Integer id);
}
--
Gitblit v1.7.1