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

liding

8 天以前 1d915922d8197aa5d5dc3e40e3088d983dd6e141

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

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