Merge branch 'master' of https://github.com/Andy-Yin/zhitan-ems

ustcyc

2025-03-21 f51be3cd3f96e4f8875fad0d6bb13d9ebcca9f93

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

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