Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminUserLogic.java

@@ -600,7 +600,9 @@ public class AdminUserLogic {
                 .like(StringUtils.isNotBlank(companyWechatName), AdminUser::getCompanyName, companyWechatName)
                 .eq(StringUtils.isNotBlank(roleId), AdminUser::getRoleId, roleId)
                 .eq(status != null, AdminUser::getStatus, status)
-                .like(StringUtils.isNotBlank(userName), AdminUser::getUserName, userName)
+                .and(StringUtils.isNotBlank(userName), v -> v.like(AdminUser::getUserName, userName)
+                        .or()
+                        .like(AdminUser::getNickName, userName))
                 .in(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()), AdminUser::getCompanyWechatId, adminUser.getCompanyWechatIds())
                 .and(CollectionUtils.isNotEmpty(adminUserIds),item -> item.in( AdminUser::getAdminUserId, adminUserIds)
                 .ne(AdminUser::getUserName,"admin")