Merge remote-tracking branch 'origin/dev_New' into dev_New

gongchunyi

9 天以前 61fef835f616f70ca35e1f046cdda82d6b68bfdc

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

@@ -135,5 +135,8 @@
     */
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;

    /**
     *所属用电区域id
     */
    private Long electricityConsumptionAreaId;
}