Merge remote-tracking branch 'origin/master'

maven

2025-10-15 0e4272399c014a3c6987ef4bd7d70f6ad90610ce

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

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