From 622e2b900a43fb6658e4d46cd376cd99e9633ab1 Mon Sep 17 00:00:00 2001
From: zt916916 <1903964620@qq.com>
Date: 星期四, 20 三月 2025 18:37:05 +0800
Subject: [PATCH] Merge branch 'develop1.0' into zt_from_develop1.0
---
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