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

chenhj

昨天 974edeb0c94bc9140dfdcc74d0d799994c959c9f

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

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