Merge remote-tracking branch 'origin/dev_New' into sqd_new

maven

2026-02-03 7e07b56a4ae92a8e827aab5165fcd7a3a1703949

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

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