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 | 56 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 9 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 bb711a0..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
@@ -41,18 +41,56 @@
@Excel(name = "鍚按鐜�", width = 15)
@ApiModelProperty(value = "鍚按鐜�")
private Double moisture;
- /**娓╁害*/
- @Excel(name = "娓╁害", width = 15)
- @ApiModelProperty(value = "娓╁害")
- private Double temp;
+ /**椋庢満娓╁害*/
+ @Excel(name = "椋庢満娓╁害", width = 15)
+ @ApiModelProperty(value = "椋庢満娓╁害")
+ private Double fanTemp;
+ /**椋庣娓╁害*/
+ @Excel(name = "椋庣娓╁害", width = 15)
+ @ApiModelProperty(value = "椋庣娓╁害")
+ private Double bellowsTemp;
/**鏃堕棿*/
- @Excel(name = "鏃堕棿", width = 15, format = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
+ @Excel(name = "鏃堕棿", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "鏃堕棿")
private Date tim;
- /**绉熸埛id*/
- @Excel(name = "绉熸埛id", width = 15)
+
+ /**鎬绘椂闂�*/
+ @Excel(name = "鎬绘椂闂�", width = 15)
+ @ApiModelProperty(value = "鎬绘椂闂�")
+ private Integer totalTime;
+ /**骞茬嚗鏃堕棿s*/
+ @Excel(name = "骞茬嚗鏃堕棿s", width = 15)
+ @ApiModelProperty(value = "骞茬嚗鏃堕棿s")
+ private Integer dryTime;
+ /**缈绘枡娆℃暟*/
+ @Excel(name = "缈绘枡娆℃暟", width = 15)
+ @ApiModelProperty(value = "缈绘枡娆℃暟")
+ private Integer turn;
+ /**椋庢満棰戠巼*/
+ @Excel(name = "椋庢満棰戠巼", width = 15)
+ @ApiModelProperty(value = "椋庢満棰戠巼")
+ private Double fanFrequency;
+ /**瀹炴椂閲嶉噺*/
+ @Excel(name = "瀹炴椂閲嶉噺", width = 15)
+ @ApiModelProperty(value = "瀹炴椂閲嶉噺")
+ private Double weight;
+ /**鐑1/鍐烽0*/
+ @Excel(name = "鐑1/鍐烽0", width = 15)
+ @ApiModelProperty(value = "鐑1/鍐烽0")
+ private Boolean wind;
+ /**绉熸埛id*/
+ @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