From 9af47b4c0c25c5c2159ac6ceefced88dec72a2f9 Mon Sep 17 00:00:00 2001 From: baoshiwei <baoshiwei@shlanbao.cn> Date: 星期五, 25 十月 2024 16:58:18 +0800 Subject: [PATCH] Merge branch 'master' into herb-new --- 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