From 98d925ee9e40ccffed46f9000ae4f066aa99776b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 15 四月 2026 09:40:26 +0800
Subject: [PATCH] ``` refactor(energy): 优化实时能耗数据服务实现

---
 src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
index 45cf329..96c2f86 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
@@ -1,9 +1,7 @@
 package com.ruoyi.device.dto;
 
-
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -19,6 +17,12 @@
     @ApiModelProperty("璁惧鍙拌处id")
     private Long deviceLedgerId;
 
+    @ApiModelProperty("璁惧鍖哄煙id")
+    private Long areaId;
+
+    @ApiModelProperty("璁惧鍖哄煙鍚嶇О")
+    private String areaName;
+
     @ApiModelProperty("璁惧鍚嶇О")
     private String deviceName;
 
@@ -27,7 +31,7 @@
 
     @ApiModelProperty("鎶ヤ慨鏃堕棿")
     private Date repairTime;
-    
+
     private String repairTimeStr;
 
     @ApiModelProperty("鎶ヤ慨浜�")
@@ -69,7 +73,4 @@
     @ApiModelProperty("绉熸埛id")
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
-    @ApiModelProperty("缁翠慨浠锋牸")
-    private String maintenancePrice;
 }
-

--
Gitblit v1.9.3