Merge remote-tracking branch 'origin/master'

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

@@ -368,6 +368,7 @@ public class AdminUserLogic {
                     }
                 })
                 .like(StringUtils.isNotEmpty(userName), AdminUser::getUserName, userName)
+                .like(StringUtils.isNotEmpty(companyName), AdminUser::getCompanyName, companyName)
                 .page(new Page<>(pageNum, pageSize));
         return page;
     }