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

云

2026-05-25 1b77c2724e38d087f3eab4a2f27b3b165f4265dc

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

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