Merge branch 'pim_ywx'

yaowanxin

2025-09-26 eb326e7fcfa56f209038f66434bbb6476db7ebae

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

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