From c01f7222dcd48a7263ee414287469c754e7de22c Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 12 四月 2024 10:17:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/UserServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/UserServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/UserServiceImpl.java
index adb4bce..802ceff 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/UserServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/UserServiceImpl.java
@@ -27,7 +27,7 @@
 
     @Override
     public PageResult<User> pageRel(PageParam<User, BaseParam> pageParam) {
-        return new PageResult<>(this.baseMapper.selectPageRel(pageParam, pageParam.pickOutMap()), pageParam.getTotal());
+        return new PageResult<>(this.baseMapper.selectPageRel(pageParam, pageParam.pickOutMap(true)), pageParam.getTotal());
     }
 
     @Override

--
Gitblit v1.9.1