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

maven

9 天以前 dc3a872dd2f2cfcddd3db4e722efa376705482ec

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

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