From 3bcd305ef9408ae54f7ef62b8472d0813ae34333 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期五, 16 六月 2023 16:53:44 +0800
Subject: [PATCH] 解决冲突

---
 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IMenuService.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IMenuService.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IMenuService.java
index b6b738a..d376f40 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IMenuService.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IMenuService.java
@@ -16,7 +16,9 @@
  */
 package com.vci.ubcs.system.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.node.TreeNode;
@@ -50,7 +52,7 @@
 	 * @param param
 	 * @return
 	 */
-	List<MenuVO> lazyMenuList(Long parentId, Map<String, Object> param);
+	IPage<MenuVO> lazyMenuPage(Long parentId, Map<String, Object> param, Query query);
 
 	/**
 	 * 鑿滃崟鏍戝舰缁撴瀯

--
Gitblit v1.9.3