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

maven

2025-12-16 b1b59aac99c3d465d51e5fb4f7ab8185ddb733d2

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

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