From ce3442f1438eb7416720882d11f36bcc4f75b2c6 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期三, 16 四月 2025 19:25:40 +0800
Subject: [PATCH] Merge pull request #63 from zhitan-cloud/dyl_dev

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

diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/energyMonitor/ElectricLoadController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/energyMonitor/ElectricLoadController.java
index 337f918..be5615e 100644
--- a/zhitan-admin/src/main/java/com/zhitan/web/controller/energyMonitor/ElectricLoadController.java
+++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/energyMonitor/ElectricLoadController.java
@@ -53,7 +53,7 @@
                            @RequestParam(name = "timeCode") String timeCode) {
         EnergyIndex energyIndex = energyIndexService.getDeviceIndexByCode(nodeId, meterId, CommonConst.TAG_CODE_ZYGGL);
 
-        ListElectricLoadVO vo = electricLoadService.list(timeType, timeCode, energyIndex);
+        ListElectricLoadVO vo = electricLoadService.list(timeType, timeCode, energyIndex, meterId);
         return AjaxResult.success(vo);
     }
 

--
Gitblit v1.9.3