Merge branch 'refs/heads/dev_New_pro' into dev_宁夏_英泽防锈

云

2026-05-27 620bb4712a31791231c4381581f0f60088f079fe

 src/main/java/com/ruoyi/equipmentenergyconsumption/dto/ElectricityConsumptionAreaTreeDto.java

@@ -3,8 +3,7 @@
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 io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

import java.util.List;