Merge branch 'hxsj' of http://114.132.189.42:9002/r/product-inventory-manag...

huminmin

2026-03-28 771dbd46e99b0a5db639a9029bf401626699af85

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

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