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

maven

9 天以前 da5094f2b971076db2b09faf78ee6fc65e35f7c7

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

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

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