From 357c778a545822c9fe396b795f64e52bc28ef403 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 13 八月 2025 15:38:59 +0800
Subject: [PATCH] Merge branch 'pim_zss'

---
 src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java |    6 +++++-
 1 files changed, 5 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..856edd1 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java
@@ -135,5 +135,9 @@
      */
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
-
+    /**
+     *鎵�灞炵敤鐢靛尯鍩焛d
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long electricityConsumptionAreaId;
 }

--
Gitblit v1.9.3