Merge branch 'dev_tide' into dev_tide_gybjyhglxt

zouyu

3 天以前 0b0b8419586505154a7e57e7c32c9a44329347ce

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

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