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

云

2026-04-20 2cf0b0d03d285fb86c232703510cd80cceb6e186

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

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

    @TableField(fill = FieldFill.INSERT)
    private Long deptId;
}