From 10e83311f7457f07b3d0928fba0de6a5622f1748 Mon Sep 17 00:00:00 2001
From: ali <ali9696@163.com>
Date: 星期四, 06 三月 2025 09:57:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into develop_alioo
---
zhitan-system/src/main/java/com/zhitan/model/domain/EnergyIndex.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/model/domain/EnergyIndex.java b/zhitan-system/src/main/java/com/zhitan/model/domain/EnergyIndex.java
index aa59f95..c9af73f 100644
--- a/zhitan-system/src/main/java/com/zhitan/model/domain/EnergyIndex.java
+++ b/zhitan-system/src/main/java/com/zhitan/model/domain/EnergyIndex.java
@@ -75,18 +75,21 @@
@ApiModelProperty(value = "琛ㄨid")
private String meterId;
+
@ApiModelProperty(value = "椤哄簭鍙�")
@Excel(name = "椤哄簭鍙�")
private int orderNum;
@ApiModelProperty(value = "")
private String equipment;
+
@ApiModelProperty(value = "id")
private String energyId;
@Transient
@TableField(exist = false)
private String meterName;
+
public void setIndexId(String indexId) {
this.indexId = indexId;
}
--
Gitblit v1.9.3