From c89dd113d8573a10a9e666785b8be5d4c3ef511d Mon Sep 17 00:00:00 2001
From: ali <ali9696@163.com>
Date: 星期一, 24 二月 2025 15:05:27 +0800
Subject: [PATCH] Merge branch 'develop1.0' into develop_alioo
---
zhitan-system/src/main/java/com/zhitan/energyMonitor/service/IElectricLoadService.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/energyMonitor/service/IElectricLoadService.java b/zhitan-system/src/main/java/com/zhitan/energyMonitor/service/IElectricLoadService.java
index 86fcd2c..cfc6098 100644
--- a/zhitan-system/src/main/java/com/zhitan/energyMonitor/service/IElectricLoadService.java
+++ b/zhitan-system/src/main/java/com/zhitan/energyMonitor/service/IElectricLoadService.java
@@ -17,7 +17,7 @@
/**
* 鑾峰彇璐熻嵎鍒嗘瀽鏁版嵁
*/
- ListElectricLoadVO list(String timeType, String timeCode, EnergyIndex energyIndex);
+ ListElectricLoadVO list(String timeType, String timeCode, EnergyIndex energyIndex, String meterId);
/**
* 鑾峰彇鑺傜偣涓嬫墍鏈夌數琛�
--
Gitblit v1.9.3