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

yaowanxin

4 天以前 93ccb6e153b5523a46738bbf6713cd4df25a49e4

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

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