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/IDeptService.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/IDeptService.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IDeptService.java
index 2dc4d02..3f4c0ff 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IDeptService.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IDeptService.java
@@ -16,9 +16,11 @@
  */
 package com.vci.ubcs.system.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.vci.ubcs.system.entity.Dept;
 import com.vci.ubcs.system.vo.DeptVO;
+import org.springblade.core.mp.support.Query;
 
 import java.util.List;
 import java.util.Map;
@@ -38,7 +40,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, Query query);
 
 	/**
 	 * 鏍戝舰缁撴瀯

--
Gitblit v1.9.3