From fd35f223b7f40ee9ee4a9307384b54a96d7956a2 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 31 十月 2024 09:35:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java
index 3d0e9e0..7db9f8c 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java
+++ b/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);
     }
     
     

--
Gitblit v1.7.1