Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventor...

chenhj

2026-04-22 2ab6b6860e4f7bee67a0f66831b9b1fb0f420710

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

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

    @TableField(fill = FieldFill.INSERT)
    private Long deptId;
}