Merge branch 'dev_New' into dev_宁夏_中盛建材

zss

2026-03-10 43113d6b1670530dfb4348836fd491c79f36af0a

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

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