Merge branch 'dev-zrj' into 'staging'

Dev zrj

See merge request !13

src/main/java/com/edgec/browserbackend/account/service/impl/AdministratorServiceImpl.java

@@ -395,11 +395,12 @@ public class AdministratorServiceImpl implements AdministratorService {
             Date dateTime2 = formatter.parse(strDate2);
             Page<Account> accountPage = accountRepository.findAllBySignupDateBetweenAndPromotionCodeAndParentIsNull(pageable, dateTime1, dateTime2, account.getPromotion().getCode());
             List<AccountPromotionDto> accountPromotionDtos = new ArrayList<>();
-            if (accountPage.getNumber() > 0) {
+            if (accountPage.getNumberOfElements() > 0) {
                 accountPage.get().forEach(account1 -> {
                     accountPromotionDtos.add(new AccountPromotionDto(account1));
                 });
             }
+            log.error(accountPromotionDtos.size() +"");
             Page<AccountPromotionDto> accountPromotionDtoPage = new PageImpl<AccountPromotionDto>(accountPromotionDtos);
             promotionQueryResultDto.setUsers(accountPromotionDtoPage);