Merge branch 'develop1.0' into zhangjw_from_develop1.0

z1415143022

2025-03-25 75f9894ebac12b13c7ead27c3e16db833ee9251a

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

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