From 9fb6f5adf9f63deffd377c001aaab8ffeae4c742 Mon Sep 17 00:00:00 2001 From: maven <2163098428@qq.com> Date: 星期一, 25 八月 2025 11:37:46 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java index c6562aa..846fc8a 100644 --- a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java +++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java @@ -135,5 +135,8 @@ */ @TableField(fill = FieldFill.INSERT) private Long tenantId; - + /** + *鎵�灞炵敤鐢靛尯鍩焛d + */ + private Long electricityConsumptionAreaId; } -- Gitblit v1.9.3