Merge branch 'dev_衡阳_鹏创电子' of http://114.132.189.42:9002/r/product-inventor...

huminmin

16 小时以前 5929fa552fd2d8cf9d4cad0d519c89728e4a6ada

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

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