Merge remote-tracking branch 'origin/master'

maven

2025-10-21 3240968279b2960b05071db0ac4e950955a69dfd

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

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