From b4b962e1ca05abd8bfc63c80f1adc3df5cfa1a24 Mon Sep 17 00:00:00 2001
From: bsw215583320 <baoshiwei121@163.com>
Date: 星期一, 26 六月 2023 13:00:06 +0800
Subject: [PATCH] 增加电能和蒸汽消耗,完善工单机器状态

---
 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
index 7e91bd5..1e26181 100644
--- 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