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

ali

2025-02-14 25648562a9c396f9013a26b4a892155ee77becbb

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

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