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

maven

16 小时以前 f4e70436bb93ab6cc7e2b8c27afa9a5978371855

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

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