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

liyong

6 天以前 cf77dd834b5c4f6b75aea748ba3f1d812de8414c

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

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