Merge remote-tracking branch 'refs/remotes/origin/jtwy' into sqd-hb

liyong

2026-01-20 ca0565e53494417b3779759f8d3898e07bfd5929

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

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