Merge remote-tracking branch 'origin/pim-jlmy' into pim_ywx

yaowanxin

10 天以前 df35c666ff8342343c82735ee25c5f04ae0d054c

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

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