java/mx_charging_pile.git

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