From 7c585586e9bea943161676bd9d127e81123891c3 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 11 十二月 2024 11:01:35 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' 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
old mode 100644
new mode 100755
index bac31a2..01a2968
--- 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