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

huminmin

昨天 c924d59a94fc17d570610cbf2b691481dd0b2e4d

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

@@ -135,5 +135,8 @@
     */
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;

    /**
     *所属用电区域id
     */
    private Long electricityConsumptionAreaId;
}