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

云

9 天以前 31bb16817c3702b4515a05e010dffa8b490c83b6

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

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