From cc52e21c310fc2dba49c24d7ed985b0aed1bb489 Mon Sep 17 00:00:00 2001
From: VVT789 <sdxt_0802@163.com>
Date: 星期一, 17 二月 2025 23:26:55 +0800
Subject: [PATCH] Merge branch 'master' into wt_from_develop1.0
---
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