From ac135b66a5ab9f2f74c55961066974e815b88e9a Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 04 九月 2025 16:08:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim_ywx' into pim_ywx
---
src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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..4911305 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java
@@ -19,20 +19,21 @@
* 鍖哄煙鍚嶇О
*/
@ApiModelProperty("鍖哄煙鍚嶇О")
- @Excel(name = "鍖哄煙鍚嶇О")
private String areaName;
/**
* 鍖哄煙绫诲瀷
*/
@ApiModelProperty("鍖哄煙绫诲瀷")
- @Excel(name = "鍖哄煙绫诲瀷")
private String areaType;
+ /**
+ * 鎺掑簭
+ */
+ private Long sort;
/**
* 鐖剁被id
*/
- @TableField(fill = FieldFill.INSERT)
private Long fuId;
/**
* 绉熸埛id
--
Gitblit v1.9.3