Merge remote-tracking branch 'origin/master'

xuhy

2024-09-10 dcff8ae4cd446921c85cc956a7e27bb715c3c582

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java

@@ -73,8 +73,7 @@
    public R<AccountListVO> accountBillList(@RequestBody ChargingListQuery dto) {
        AccountListVO accountListVO = new AccountListVO();
        ChargingBillVO res = chargingBillService.chargingBillList(dto);
        dto.setPageCurr(1);
        dto.setPageSize(99999999);

        ChargingBillVO res1 = chargingBillService.chargingBillList(dto);
        List<ChargingBillListVO> records = res1.getList().getRecords();
        accountListVO.setBillCount(records.size());