From 36990e3fc35d1dcf341895b65cba19a0d805f258 Mon Sep 17 00:00:00 2001 From: ustcyc <yincun@163.com> Date: 星期三, 16 四月 2025 20:13:00 +0800 Subject: [PATCH] Merge branch 'master' of https://github.com/zhitan-cloud/zhitan-ems --- 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