From 0d564acb20296f5f289d0fedfc1b09ef421892a3 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 11 八月 2025 09:48:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim_zss' into pim_ywx
---
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