Merge branch 'develop1.0' into zhangjw_from_develop1.0

z1415143022

2025-03-25 75f9894ebac12b13c7ead27c3e16db833ee9251a

 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;