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

buhuazhen

7 天以前 706d0d62cc25829ec6948e2fd5d03e62acf29306

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

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

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