From a98454d581018eeee3ca8e7f9b381bee6608eb2d Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 16 六月 2026 11:59:27 +0800
Subject: [PATCH] feat: 增强电量记录汇总功能，优化时间范围处理及合并逻辑

---
 src/main/java/com/ruoyi/equipmentenergyconsumption/dto/ElectricityConsumptionAreaTreeDto.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/dto/ElectricityConsumptionAreaTreeDto.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/dto/ElectricityConsumptionAreaTreeDto.java
index b481090..1ce0969 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/dto/ElectricityConsumptionAreaTreeDto.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/dto/ElectricityConsumptionAreaTreeDto.java
@@ -3,8 +3,7 @@
 import com.baomidou.mybatisplus.annotation.*;
 import com.ruoyi.basic.dto.ProductTreeDto;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.List;

--
Gitblit v1.9.3