From 3b383c80c90a7d0cdc980ce6fe9889bfa20fecb9 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 07 四月 2024 08:29:05 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master 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