Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-31 d1d7df6417a76d481e654c96b2db34e4fbab88ea

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java

@@ -148,14 +148,14 @@
                .eq(TParkingLot::getSiteId, siteId)));
    }

    @PostMapping(value = "/getRecordById")
    @GetMapping(value = "/getRecordById")
    public R<TParkingRecord> getRecordById(@RequestParam("id") Long id){
        return R.ok(parkingRecordService.getById(id));
    }
    @PostMapping(value = "/getRecordAmount")
    public R<BigDecimal> getRecordAmount(@RequestParam("sixBefore") LocalDate sixBefore){
        BigDecimal sum =  parkingRecordService.getSum(sixBefore);
        return R.ok();
        return R.ok(sum);
    }