Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

zss

15 小时以前 e45f6b4649edf03df3973a7dbe76b53b7e57a366

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

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

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