Merge branch 'refs/heads/develop1.0' into dyl_dev

DYL

2025-02-11 2bb1c5a1f285e5380a675de6d88ab4b83d7fcef7

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