Merge remote-tracking branch 'origin/master'

zss

2025-09-23 554efce62c29185cfc1a6e77c65b7c04137d2332

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

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

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