From c58f449890007f3840f1fe8ae2df953e76b89d32 Mon Sep 17 00:00:00 2001 From: DYL <Dn1332079466> Date: 星期五, 07 二月 2025 17:19:54 +0800 Subject: [PATCH] Merge branch 'refs/heads/develop1.0' into dyl_dev --- zhitan-system/src/main/java/com/zhitan/peakvalley/domain/vo/peakvalley/PeakValleyDayVO.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/zhitan-system/src/main/java/com/zhitan/peakvalley/domain/vo/peakvalley/PeakValleyDayVO.java b/zhitan-system/src/main/java/com/zhitan/peakvalley/domain/vo/peakvalley/PeakValleyDayVO.java index ef807cf..8930f1a 100644 --- a/zhitan-system/src/main/java/com/zhitan/peakvalley/domain/vo/peakvalley/PeakValleyDayVO.java +++ b/zhitan-system/src/main/java/com/zhitan/peakvalley/domain/vo/peakvalley/PeakValleyDayVO.java @@ -1,5 +1,6 @@ package com.zhitan.peakvalley.domain.vo.peakvalley; +import com.zhitan.home.domain.vo.HomeEnergyConsumptionTrendVO; import lombok.Getter; import lombok.Setter; @@ -15,4 +16,8 @@ List<PeakValleyLineChatVO> costList; List<PeakValleyLineChatVO> powerConsumptionList; PeakValleyDayTotalVO totalVO; + + HomeEnergyConsumptionTrendVO costNewList; + + HomeEnergyConsumptionTrendVO powerNewList; } -- Gitblit v1.9.3