Merge branch 'develop1.0' into wt_from_develop1.0

VVT789

2025-03-22 ff76035a5d9c4de83bdf4c7feb86c842715f1312

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

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


}