Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-ma...

huminmin

2026-02-10 53b97161be666fc57c9aba6000e0c2484915f196

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

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