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

gongchunyi

8 天以前 86a19fc0b8fe415adb353c789b228c63612d980a

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

@@ -26,4 +26,10 @@

    //能耗场景(办公/生产)
    private String type;

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

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