From 6c56f35bef519265b4e7ae98fda6ca87855daf9f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 15 十二月 2022 11:29:08 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

---
 ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminMapper.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminMapper.java b/ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminMapper.java
index 0fcda1c..fecdb07 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminMapper.java
+++ b/ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminMapper.java
@@ -3,7 +3,6 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ycl.entity.user.UmsAdmin;
-import com.ycl.vo.user.UserVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -23,6 +22,6 @@
      */
     List<Long> getAdminIdList(@Param("resourceId") Long resourceId);
 
-    Page<UmsAdmin> selectCondPage(@Param("page") Page<UmsAdmin> page, @Param("umsAdmin") UserVO.PageUserVO pageUserVO);
+    Page<UmsAdmin> selectCondPage(Page<UmsAdmin> page,UmsAdmin umsAdmin);
 
 }

--
Gitblit v1.8.0