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

gongchunyi

4 天以前 98af2bbf6d7c1c821919fc2221c4181479cdc562

 src/main/java/com/ruoyi/energy/vo/EnergyStatisticsVo.java

@@ -29,4 +29,7 @@

    //能耗类型(水/电/气)
    private String energyName;

    //日/月/年
    private String state;
}