Merge remote-tracking branch 'origin/prod' into dev_tide_mom

zouyu

2025-11-14 7f56f78fbaa4569873bccc9a5169518d79412b94

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

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