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

liyong

16 小时以前 168b0d2b658fffb2cf3fd1cf569a6c7b25c36a47

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

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