From 8c6aad555647fcecaddfaed99516d8b93db837c8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 01 四月 2026 11:18:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/energy/service/EnergyConsumptionDetailService.java | 8 +++++++-
1 files changed, 7 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..eb11b94 100644
--- a/src/main/java/com/ruoyi/energy/service/EnergyConsumptionDetailService.java
+++ b/src/main/java/com/ruoyi/energy/service/EnergyConsumptionDetailService.java
@@ -2,10 +2,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.energy.dto.EnergyAccountDto;
+import com.ruoyi.energy.dto.EnergyCollectDto;
import com.ruoyi.energy.dto.EnergyConsumptionDetailDto;
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 +30,9 @@
void export(HttpServletResponse response);
- Object statistics(EnergyStatisticsDto energyStatisticsDto);
+ EnergyStatisticsDto statistics(EnergyStatisticsVo energyStatisticsVo);
+ EnergyAccountDto account(EnergyStatisticsVo energyStatisticsVo);
+
+ EnergyCollectDto collectEnergy(EnergyStatisticsVo energyStatisticsVo);
}
--
Gitblit v1.9.3