Merge remote-tracking branch 'origin/jtwy' into jtwy

liyong

昨天 7558d3cb61282e41e27f85f56e829c6e6409f66d

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

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