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/mapper/MenuMapper.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/MenuMapper.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/MenuMapper.java
index f66512a..44d84a6 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/MenuMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/MenuMapper.java
@@ -17,6 +17,7 @@
 package com.vci.ubcs.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.tool.node.TreeNode;
 import com.vci.ubcs.system.dto.MenuDTO;
 import com.vci.ubcs.system.entity.Menu;
@@ -49,7 +50,7 @@
 	 * @param param
 	 * @return
 	 */
-	List<MenuVO> lazyMenuList(Long parentId, Map<String, Object> param);
+	IPage<MenuVO> lazyMenuPage(Long parentId, Map<String, Object> param, IPage page);
 
 	/**
 	 * 鏍戝舰缁撴瀯

--
Gitblit v1.9.3