From b0765ec5be45d6db1993064d5261bf42e94d161f Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 12 八月 2025 16:38:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into pim_yys
---
src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java
index 408a13f..e022468 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java
@@ -28,6 +28,11 @@
@ApiModelProperty("鍖哄煙绫诲瀷")
@Excel(name = "鍖哄煙绫诲瀷")
private String areaType;
+ /**
+ * 鎺掑簭
+ */
+ @TableField(fill = FieldFill.INSERT)
+ private Long sort;
/**
* 鐖剁被id
--
Gitblit v1.9.3