Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-11 8ef73a8875b9b618e471aafc383f85ba6ab7a154

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java

@@ -299,10 +299,10 @@
    
    
    
    @GetMapping(value = "/settlementTotalR/{time}")
    public R<SettlementTotalVO> settlementTotalR(@PathVariable("time")String time) {
    @GetMapping(value = "/settlementTotalR/{time}/{userId}")
    public R<SettlementTotalVO> settlementTotalR(@PathVariable("time")String time,@PathVariable("userId")Long userId) {
        time = time+"-01 00:00:00";
        SettlementTotalVO res = chargingOrderService.settlementTotal(time);
        SettlementTotalVO res = chargingOrderService.settlementTotalR(time,userId);
        return R.ok(res);
    }