From 2757f1d46f388f684aad93b3dc7ad805c45c6248 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 14 一月 2026 09:28:39 +0800
Subject: [PATCH] Merge branch 'jtwy' into dev_New

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

--
Gitblit v1.9.3