From d46beba25ccb64a1047a98d642b6ce45e82f0bee Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 17 十月 2022 18:07:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
ycl-common/src/main/java/com/ycl/service/depart/UmsDepartService.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/service/depart/UmsDepartService.java b/ycl-common/src/main/java/com/ycl/service/depart/UmsDepartService.java
index 50f9d50..550c14d 100644
--- a/ycl-common/src/main/java/com/ycl/service/depart/UmsDepartService.java
+++ b/ycl-common/src/main/java/com/ycl/service/depart/UmsDepartService.java
@@ -1,10 +1,12 @@
package com.ycl.service.depart;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.entity.depart.UmsDepart;
import com.ycl.vo.depart.DepartVO;
import com.ycl.vo.depart.UmsDepartVO;
+import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@@ -41,25 +43,29 @@
/**
* 鍒犻櫎
+ *
* @param id
*/
void delete(long id);
/**
* 鏍戝舰
+ *
* @return
*/
List<UmsDepart> tree();
/**
* 鍒嗛〉
- * @param params
+ *
+ * @param page
* @return
*/
- IPage<UmsDepartVO> pageDepart(DepartVO.PageDepartVO params);
+ IPage<UmsDepartVO> pageDepart(String departName, IPage<UmsDepartVO> page);
/**
* 淇敼鐘舵��
+ *
* @param params
*/
void updateStatus(DepartVO.StatusDepartVO params);
--
Gitblit v1.8.0