From af6b8c62f914e681e4ac325cb4be61d2aaa9ea7d Mon Sep 17 00:00:00 2001 From: VVT789 <sdxt_0802@163.com> Date: 星期五, 21 三月 2025 15:58:27 +0800 Subject: [PATCH] Merge branch 'master' into develop1.0 --- zhitan-admin/src/main/java/com/zhitan/web/controller/energyMonitor/ElectricThreePhaseController.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/energyMonitor/ElectricThreePhaseController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/energyMonitor/ElectricThreePhaseController.java index fca2c2d..3a10efa 100644 --- a/zhitan-admin/src/main/java/com/zhitan/web/controller/energyMonitor/ElectricThreePhaseController.java +++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/energyMonitor/ElectricThreePhaseController.java @@ -56,6 +56,7 @@ if (ObjectUtils.isEmpty(meterId)){ return AjaxResult.error("鐢佃〃id涓嶈兘涓虹┖"); } + List<EnergyIndex> energyIndexList = energyIndexService.listDeviceIndex(nodeId, meterId); return AjaxResult.success(electricThreePhaseService.list(timeType, timeCode, energyIndexList, requestType, meterId)); -- Gitblit v1.9.3