From c12ca804e93a7f62b006dca60fa3d8797e0480d8 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期一, 15 三月 2021 00:33:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/mapper/UserMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/mapper/UserMapper.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/mapper/UserMapper.java
index 3dd155a..8c2a702 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/mapper/UserMapper.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/mapper/UserMapper.java
@@ -21,7 +21,7 @@
      * @param <T>  type
      * @return Ipage
      */
-    <T> IPage<SystemUser> findUserDetailPage(Page<T> page, @Param("user") SystemUser user);
+    <T> IPage<SystemUser> findUserDetailPage(Page<T> page, @Param("user") SystemUser user,@Param("currentUserId") String currentUserId);
 
     /**
      * 查找用户详细信息

--
Gitblit v1.8.0