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

maven

8 天以前 9e5c392acb19838c263a569b09bb56da94bdbbf6

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

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