Merge branch 'jtwy' into dev_New

zss

2 天以前 2757f1d46f388f684aad93b3dc7ad805c45c6248

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

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