From ca75cf818e434f77ca71d78ac2c883ca41b18713 Mon Sep 17 00:00:00 2001 From: bsw215583320 <baoshiwei121@163.com> Date: 星期五, 22 十一月 2024 11:12:14 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/herb' into herb --- jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrderTrend.java | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrderTrend.java b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrderTrend.java index bac31a2..01a2968 100644 --- a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrderTrend.java +++ b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrderTrend.java @@ -84,4 +84,13 @@ @Excel(name = "绉熸埛id", width = 15) @ApiModelProperty(value = "绉熸埛id") private Integer tenantId; + + + /**钂告苯娑堣��*/ + @ApiModelProperty(value = "钂告苯娑堣��") + private Double steam; + + /**鐢佃兘娑堣��*/ + @ApiModelProperty(value = "鐢佃兘娑堣��") + private Double watt; } -- Gitblit v1.9.3