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/DeptMapper.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/DeptMapper.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/DeptMapper.java
index ef7b5c0..ee6f598 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/DeptMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/DeptMapper.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 com.vci.ubcs.system.entity.Dept;
 import com.vci.ubcs.system.vo.DeptVO;
 
@@ -38,7 +39,7 @@
 	 * @param param
 	 * @return
 	 */
-	List<DeptVO> lazyList(String tenantId, Long parentId, Map<String, Object> param);
+	IPage<DeptVO> lazyList(String tenantId, Long parentId, Map<String, Object> param,IPage page);
 
 	/**
 	 * 鑾峰彇鏍戝舰鑺傜偣

--
Gitblit v1.9.3