From 46b2ee5f0d9fc6ffaffee1f9de3f4f56d63355b4 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 13 三月 2026 13:31:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

---
 src/main/java/com/ruoyi/energy/service/EnergyConsumptionDetailService.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/energy/service/EnergyConsumptionDetailService.java b/src/main/java/com/ruoyi/energy/service/EnergyConsumptionDetailService.java
index 2e77177..d770f01 100644
--- a/src/main/java/com/ruoyi/energy/service/EnergyConsumptionDetailService.java
+++ b/src/main/java/com/ruoyi/energy/service/EnergyConsumptionDetailService.java
@@ -6,6 +6,7 @@
 import com.ruoyi.energy.dto.EnergyStatisticsDto;
 import com.ruoyi.energy.pojo.EnergyConsumptionDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.energy.vo.EnergyStatisticsVo;
 import com.ruoyi.framework.web.domain.R;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -27,6 +28,6 @@
 
     void export(HttpServletResponse response);
 
-    Object statistics(EnergyStatisticsDto energyStatisticsDto);
+    EnergyStatisticsDto statistics(EnergyStatisticsVo energyStatisticsVo);
 
 }

--
Gitblit v1.9.3