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

云

7 天以前 b701cf0331e91900bf8055009a745d4953a6c510

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

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

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