Merge branch 'master' into pim_meet

buhuazhen

2025-10-28 47768d890fbfc1a5f3e93ca26137847361415e9e

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

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