From 417ec7c8e4388b0878c9b28c47c06972e98d9c17 Mon Sep 17 00:00:00 2001 From: zhitan-cloud <394600+ustcyc@user.noreply.gitee.com> Date: 星期二, 18 二月 2025 14:23:27 +0800 Subject: [PATCH] !87 !86 删除文件 .DS_Store Merge pull request !87 from zhitan-cloud/develop1.0 --- 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