Merge branch 'pim_bhz' into pim_ywx

buhuazhen

9 天以前 93723438fd269d2f602439eabca127ed4054818a

 src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java

@@ -138,6 +138,5 @@
    /**
     *所属用电区域id
     */
    @TableField(fill = FieldFill.INSERT)
    private Long electricityConsumptionAreaId;
}