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

zss

昨天 2be29256f04c9822dc793c75dfae16c3262d2faf

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

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