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

maven

4 天以前 83a2ac0bbf44d550a4d0add970d14623298a8574

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

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

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