From 93723438fd269d2f602439eabca127ed4054818a Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期四, 04 九月 2025 11:00:19 +0800
Subject: [PATCH] Merge branch 'pim_bhz' into pim_ywx

---
 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