From 03df670a1dfbcae8031e84e15dff0b77365f0af6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 14 八月 2025 16:39:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into pim_zss

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

diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/dto/ElectricityConsumptionAreaTreeDto.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/dto/ElectricityConsumptionAreaTreeDto.java
new file mode 100644
index 0000000..b481090
--- /dev/null
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/dto/ElectricityConsumptionAreaTreeDto.java
@@ -0,0 +1,22 @@
+package com.ruoyi.equipmentenergyconsumption.dto;
+
+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 lombok.Data;
+
+import java.util.List;
+
+
+@Data
+public class ElectricityConsumptionAreaTreeDto {
+
+        private Long id;
+        private Long parentId;
+        private String productName;
+        private String label; // 鐢ㄤ簬鏍戝舰缁撴瀯鐨勬樉绀哄悕绉�
+        private List<ElectricityConsumptionAreaTreeDto> children;
+
+}

--
Gitblit v1.9.3