From 339515558253d776769dc2e2560bbb4a0450c989 Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期五, 29 十一月 2024 09:44:44 +0800
Subject: [PATCH] 将码云版本提交至gitlab -- 20241129

---
 jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderTrendVo.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 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 4e611ac..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
@@ -61,6 +61,15 @@
     private Integer tenantId;
 
 
+    /**钂告苯娑堣��*/
+    @ApiModelProperty(value = "钂告苯娑堣��")
+    private Double steam;
+
+    /**鐢佃兘娑堣��*/
+    @ApiModelProperty(value = "鐢佃兘娑堣��")
+    private Double watt;
+
+
     public DryOrderTrendVo(RealTimeDataVo realTimeDataVo) {
         this.fanFrequency = realTimeDataVo.getFanfrq();
         this.weight = realTimeDataVo.getWeight3();
@@ -72,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