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

liding

7 天以前 db85e062349683b3131726fe90dcc99d4aff35ba

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

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

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