From 75f9894ebac12b13c7ead27c3e16db833ee9251a Mon Sep 17 00:00:00 2001
From: z1415143022 <z1415143022@163.com>
Date: 星期二, 25 三月 2025 20:02:45 +0800
Subject: [PATCH] Merge branch 'develop1.0' into zhangjw_from_develop1.0
---
zhitan-system/src/main/java/com/zhitan/consumptionanalysis/domain/vo/RankingEnergyData.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/consumptionanalysis/domain/vo/RankingEnergyData.java b/zhitan-system/src/main/java/com/zhitan/consumptionanalysis/domain/vo/RankingEnergyData.java
index 2bb1fb2..652a6ce 100644
--- a/zhitan-system/src/main/java/com/zhitan/consumptionanalysis/domain/vo/RankingEnergyData.java
+++ b/zhitan-system/src/main/java/com/zhitan/consumptionanalysis/domain/vo/RankingEnergyData.java
@@ -1,12 +1,14 @@
package com.zhitan.consumptionanalysis.domain.vo;
+import lombok.Data;
import lombok.Getter;
import lombok.Setter;
-@Getter
-@Setter
+@Data
public class RankingEnergyData {
+
public String nodeId;
+
public String nodeName;
public String energyTypeNo;
public String energyTypeName;
--
Gitblit v1.9.3