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

云

2026-04-13 6799b29dff56cb304a80d9f6907aab47ff4dd0e6

 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;
}