Merge remote-tracking branch 'origin/jtwy' into jtwy

liyong

2026-01-06 ded338d0bafa5594b275edb81a8f69ea4446c37c

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

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

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