Merge branch 'develop1.0' into wt_from_develop1.0

VVT789

2025-02-10 6c5150dfdd69a9c1d5db9c9780f721759b0e0e9c

 zhitan-admin/src/main/java/com/zhitan/web/controller/peakvalley/PeakValleyController.java

@@ -60,6 +60,7 @@
    @ApiOperation(value = "获取尖峰平谷分时统计")
    public AjaxResult segmentAnalysisDay(PeakValleyDTO dto) {
        return AjaxResult.success(rulesService.segmentAnalysisDay(dto));
//        return AjaxResult.success(rulesService.segmentAnalysisDayCustomize(dto));
    }