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

zss

4 天以前 e2c5b3a68bf3da47f5c1adf217ca96c7ec9a0076

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

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