From 676a756fe55696334202c67fcbec47b3fb5ad01d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 十一月 2024 10:44:15 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
index 986c4db..66b8377 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
@@ -282,8 +282,8 @@
SettlementTotalVO res = chargingOrderService.settlementTotal(time);
return AjaxResult.success(res);
}
- @GetMapping(value = "/settlementTotalR")
- public R<SettlementTotalVO> settlementTotalR(String time) {
+ @GetMapping(value = "/settlementTotalR/{time}")
+ public R<SettlementTotalVO> settlementTotalR(@PathVariable("time")String time) {
time = time+"-01 00:00:00";
SettlementTotalVO res = chargingOrderService.settlementTotal(time);
return R.ok(res);
--
Gitblit v1.7.1