Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-25 2a55b788f369beec74894b6d63b20400d9725a47

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

@@ -155,7 +155,7 @@
    @PostMapping(value = "/getRecordAmount")
    public R<BigDecimal> getRecordAmount(@RequestParam("sixBefore") LocalDate sixBefore){
        BigDecimal sum =  parkingRecordService.getSum(sixBefore);
        return R.ok();
        return R.ok(sum);
    }