From c4409fac0044cc1efeda07b6a7709c3fde1aa9fe Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期六, 24 十月 2026 10:46:32 +0800
Subject: [PATCH] fix(仓储物流): ①出库新增临时跳过租户插件修复 SetOperationList 解析异常 ②库存预警查询补 warningLevel/warningStatus/warningTime/expectedShortageTime/suggestionType/suggestionContent 字段 ③currentStock 别名
---
src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java
index 4ed1aff..846fc8a 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java
@@ -11,6 +11,7 @@
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.util.Date;
/**
* @author :yys
@@ -96,7 +97,7 @@
@ApiModelProperty("杩愯鏃堕棿")
@Excel(name = "杩愯鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
- private LocalDate runDate;
+ private Date runDate;
/**
* 姣忔棩闄愬埗鐢甸噺
@@ -134,5 +135,8 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
-
+ /**
+ *鎵�灞炵敤鐢靛尯鍩焛d
+ */
+ private Long electricityConsumptionAreaId;
}
--
Gitblit v1.9.3