Merge branch 'staging' into 'master'

管理员界面-推广码下线查询

See merge request !172

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

@@ -606,7 +606,7 @@ public class AdministratorServiceImpl implements AdministratorService {
                     list.add(accountPromotionDto);
                 });
             }
-            Page<AccountPromotionDto> page = new PageImpl<AccountPromotionDto>(list);
+            Page<AccountPromotionDto> page = new PageImpl<AccountPromotionDto>(list, pageable, accountPage.getTotalElements());
             return page;
         } catch (Exception e) {
             log.error(e.getMessage(), e);