Merge branch 'master' into develop1.0

zt916916

2025-03-20 46ae931e952078fc534de0b73bdc1cd35e26a597

 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);
    }