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

maven

6 天以前 d3ee63dc365fbcb964a469150c9a84717f171eda

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

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