From e45f6b4649edf03df3973a7dbe76b53b7e57a366 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 23 三月 2026 14:34:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java b/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java
index 10d0701..b6bd886 100644
--- a/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java
+++ b/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java
@@ -77,9 +77,16 @@
/*******************************************姹囨�荤粺璁�*****************************************************************************************************************************************************************************/
@GetMapping("/statistics")
- @ApiOperation("鎸夋棩鏈堝勾姹囨�荤粺璁�")
+ @ApiOperation("鑳借�楃粺璁�---鎸夋棩鏈堝勾姹囨�荤粺璁�")
public R statistics(EnergyStatisticsVo energyStatisticsVo) {
return R.ok(energyConsumptionDetailService.statistics(energyStatisticsVo));
}
+ @GetMapping("/account")
+ @ApiOperation("鑳借�楁垚鏈牳绠�---鎸夋棩鏈堟眹鎬荤粺璁�")
+ public R account(EnergyStatisticsVo energyStatisticsVo) {
+ energyStatisticsVo.setType(null);
+ return R.ok(energyConsumptionDetailService.account(energyStatisticsVo));
+ }
+
}
--
Gitblit v1.9.3