Merge remote-tracking branch 'origin/develop1.0' into develop_alioo

ali

2025-01-20 34a007951daf79f8d549ceb811d7fa9ed3fab6fd

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