Merge branch 'jtwy' into dev_New

zss

21 小时以前 56c6afb58c29c785b0a363d1dac183c4b1b2e1aa

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

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