Merge remote-tracking branch 'origin/master'

luodangjia

2024-11-04 e755145ce3a5d14468a09b4062c84d7c13a92f0c

 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);