!94 Merge remote-tracking branch 'origin/develop1.0' into develop_alioo Mer...

Alioo

2025-02-26 521eb5c1ad3e57f4b4787c913601d6e6d8bab8a3

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

    /**
     * 获取节点下所有电表