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

chenhj

10 天以前 481399bea1b66312de3c04864c49cedf5f0a6ece

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

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