From 7c585586e9bea943161676bd9d127e81123891c3 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 11 十二月 2024 11:01:35 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' into herb
---
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderTrendVo.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderTrendVo.java b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderTrendVo.java
old mode 100644
new mode 100755
index 7e91bd5..1e26181
--- a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderTrendVo.java
+++ b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderTrendVo.java
@@ -67,7 +67,7 @@
/**鐢佃兘娑堣��*/
@ApiModelProperty(value = "鐢佃兘娑堣��")
- private Double electric;
+ private Double watt;
public DryOrderTrendVo(RealTimeDataVo realTimeDataVo) {
@@ -81,6 +81,8 @@
this.turn = realTimeDataVo.getTurntime();
this.totalTime = realTimeDataVo.getTime3();
this.orderId = realTimeDataVo.getOrderId();
+ this.watt = realTimeDataVo.getWatt();
+ this.steam = realTimeDataVo.getSteam();
this.tim = new Date();
}
}
--
Gitblit v1.9.3