From 2eaa9c3ec922fd189004f541ac93fc0c78e1d79f Mon Sep 17 00:00:00 2001
From: ali <ali9696@163.com>
Date: 星期三, 26 三月 2025 17:30:23 +0800
Subject: [PATCH] 支路用能分析&&分项用能分析

---
 zhitan-admin/src/main/java/com/zhitan/web/controller/statisticalAnalysis/EnergyConsumeDataController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/statisticalAnalysis/EnergyConsumeDataController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/statisticalAnalysis/EnergyConsumeDataController.java
index 051909e..e91dc45 100644
--- a/zhitan-admin/src/main/java/com/zhitan/web/controller/statisticalAnalysis/EnergyConsumeDataController.java
+++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/statisticalAnalysis/EnergyConsumeDataController.java
@@ -41,7 +41,7 @@
                                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                           @RequestParam(name = "timeCode") String timeCode,
                                           @RequestParam(name = "timeType") String timeType,
-                                          @RequestParam(name = "energyType") String energyType,
+                                          @RequestParam(name = "energyType",required = false) String energyType,
                                           @RequestParam(name = "modelCode") String modelCode) {
         return AjaxResult.success(energyConsumeDataService.listEnergyCostTrend(pageNo, pageSize, timeCode, timeType,energyType,
                 modelCode));
@@ -62,7 +62,7 @@
     public AjaxResult listEnergyCostTrendDetail(@RequestParam(name = "timeCode") String timeCode,
                                                                                 @RequestParam(name = "timeType") String timeType,
                                                                                 @RequestParam(name = "modelCode") String modelCode,
-                                                                                @RequestParam("energyType") String energyType) {
+                                                                                @RequestParam(name = "energyType",required = false) String energyType) {
         return AjaxResult.success(energyConsumeDataService.listEnergyCostTrendDetail(timeCode, timeType, modelCode, energyType));
     }
 

--
Gitblit v1.9.3