Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

gongchunyi

4 天以前 98af2bbf6d7c1c821919fc2221c4181479cdc562

 src/main/java/com/ruoyi/energy/dto/EnergyCollectDto.java

@@ -15,5 +15,7 @@
    @ApiModelProperty("能耗类型占比")
    private List<EnergyConsumptionTypeDto> energyConsumptionTypeProportion;

    @ApiModelProperty("能耗单耗趋势")
    private List<EnergyCostDto> energyCostDtos;

}