Merge branch 'dev_New' into dev_New_kthg

zss

2026-02-06 4868a3a857174da8951650ea621287d0b9ca379f

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

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