From b82f8f6f82f0d9348997abb77e5d72deac078fa2 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Sun, 23 Apr 2023 15:40:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/IMenuService.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/IMenuService.java b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/IMenuService.java
index 735bfcb..aca2875 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/IMenuService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/IMenuService.java
@@ -18,6 +18,7 @@
 
 import cn.gistack.system.entity.Menu;
 import cn.gistack.system.vo.MenuVO;
+import cn.gistack.system.vo.WebMenuVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.node.TreeNode;
@@ -165,5 +166,5 @@
 
 	List<MenuVO> getAppMenu(String roleId);
 
-	List<MenuVO> getWebMenu(String roleId);
+	List<WebMenuVO> getWebMenu(String roleId);
 }

--
Gitblit v1.9.3