Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

buhuazhen

2026-05-21 46ac98dd7c450f5a1ddbd7762a4f6e2d036dafc7

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