From bc79b212a36b9f62bd923f13ecd0be29f6ea0200 Mon Sep 17 00:00:00 2001
From: ustcyc <yincun@163.com>
Date: 星期五, 11 四月 2025 18:46:36 +0800
Subject: [PATCH] Merge pull request #53 from zhitan-cloud/develop1.0
---
zhitan-system/src/main/java/com/zhitan/model/domain/EnergyIndex.java | 27 +--------------------------
1 files changed, 1 insertions(+), 26 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 140689e..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,6 +75,7 @@
@ApiModelProperty(value = "琛ㄨid")
private String meterId;
+
@ApiModelProperty(value = "椤哄簭鍙�")
@Excel(name = "椤哄簭鍙�")
private int orderNum;
@@ -85,35 +86,9 @@
@ApiModelProperty(value = "id")
private String energyId;
- /**
- * 鐢ㄨ兘鍗曞厓id
- */
- private String energyUnitId;
-
- /**
- * 鍗曞厓鍒拌澶囩殑id
- */
- private String energyUnitToDeviceId;
-
@Transient
@TableField(exist = false)
private String meterName;
-
- public String getEnergyUnitId() {
- return energyUnitId;
- }
-
- public String getEnergyUnitToDeviceId() {
- return energyUnitToDeviceId;
- }
-
- public void setEnergyUnitId(String energyUnitId) {
- this.energyUnitId = energyUnitId;
- }
-
- public void setEnergyUnitToDeviceId(String energyUnitToDeviceId) {
- this.energyUnitToDeviceId = energyUnitToDeviceId;
- }
public void setIndexId(String indexId) {
this.indexId = indexId;
--
Gitblit v1.9.3