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

maven

5 天以前 a20dad0f0702e192bee8b80c6237a0e9bb7d8b66

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

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