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

liyong

2026-01-20 a08dce3de307ce138396db5fe7274ead2ef5c573

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

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