From c2fccb01b972176dc3da5a497b5e904025e9e98d Mon Sep 17 00:00:00 2001 From: bsw215583320 <baoshiwei121@163.com> Date: 星期二, 16 四月 2024 15:06:51 +0800 Subject: [PATCH] Merge branch 'master' of http://210.22.126.130:1111/r/dry/herb --- 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 index 4e611ac..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 @@ -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