Merge branch 'master' of https://cloud.wodcloud.com/git/wangjinsheng/operation-control-platform

src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java

@@ -203,8 +203,7 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
         } else if (!(StringUtils.isBlank(keyword))) {
             LambdaQueryWrapper<OcpTenantGroup> ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpTenantGroup::getTenantGroupCompanyCode, keyword))
                     .or().like(OcpTenantGroup::getTenantGroupName, keyword)
-                    .or().like(OcpTenantGroup::getTenantGroupPcode, keyword)
-                    .or().like(OcpTenantGroup::getTenantGroupUserName, keyword).orderByDesc(OcpTenantGroup::getTenantGroupMtime);
+                    .orderByDesc(OcpTenantGroup::getTenantGroupMtime);
 
             tenantMapper.selectPage(page, ocpTenantGroupLambdaQueryWrapper);
 //            OcpTenantGroup ocpTenantGroup1 = new OcpTenantGroup();