Merge branch 'develop1.0' into zhangjw_from_develop1.0

z1415143022

2025-03-25 75f9894ebac12b13c7ead27c3e16db833ee9251a

 zhitan-system/src/main/java/com/zhitan/peakvalley/service/IPeakValleyService.java

@@ -41,6 +41,11 @@
     */
    PeakValleyHourVO segmentAnalysisHour(PeakValleyDTO dto);

    /**
     * 尖峰平谷分时统计导出
     * @param dto
     * @return
     */
    List<PeakValleyHourDataVO> segmentAnalysisHourExport(PeakValleyDTO dto);

    PeakValleyDayVO segmentAnalysisDayCustomize(PeakValleyDTO dto);