Merge remote-tracking branch 'origin/dev_tide_sbjkxt' into dev_tide_sbjkxt_...

zouyu

5 天以前 8f98ff2e202e5d7a39be484753db63d0165d70d7

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

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