Merge branch 'pim_ywx'

yaowanxin

4 天以前 b33e6f53dd537abaebad066de12474580fcc33b2

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

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