Merge remote-tracking branch 'origin/dev_New' into dev_新疆_大罗素马铃薯

云

8 天以前 e4c10a806ff29d18cdbdd182a5930316eae3fd83

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

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