From afae558d8eb1832769b6621d0d9c30103f7fdd89 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期五, 18 四月 2025 16:48:43 +0800
Subject: [PATCH] Merge pull request #70 from zhitan-cloud/wt_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