From cf7bc2d68e7d86e7d4b896acf1400f534d594daa Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 10 三月 2026 17:59:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/energy/dto/EnergyConsumptionDetailDto.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/energy/dto/EnergyConsumptionDetailDto.java b/src/main/java/com/ruoyi/energy/dto/EnergyConsumptionDetailDto.java
new file mode 100644
index 0000000..eec50f8
--- /dev/null
+++ b/src/main/java/com/ruoyi/energy/dto/EnergyConsumptionDetailDto.java
@@ -0,0 +1,29 @@
+package com.ruoyi.energy.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.energy.pojo.EnergyConsumptionDetail;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+//鑳借�楁妱琛ㄦ槑缁�
+@Data
+@ExcelIgnoreUnannotated
+public class EnergyConsumptionDetailDto extends EnergyConsumptionDetail {
+
+ @ApiModelProperty("鑳芥簮绫诲瀷")
+ @Excel(name = "鑳芥簮绫诲瀷")
+ private String energyTyep;
+
+ @ApiModelProperty("鑳芥簮鍚嶇О")
+ @Excel(name = "鑳芥簮鍚嶇О")
+ private String energyName;
+
+ @ApiModelProperty("鍗曚綅")
+ @Excel(name = "鍗曚綅")
+ private String unit;
+
+ //鍒涘缓浜�
+ private String createUserName;
+}
--
Gitblit v1.9.3