From 339515558253d776769dc2e2560bbb4a0450c989 Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期五, 29 十一月 2024 09:44:44 +0800
Subject: [PATCH] 将码云版本提交至gitlab -- 20241129
---
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrderTrend.java | 66 ++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 14 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 8a2cf5b..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
@@ -16,7 +16,7 @@
import lombok.experimental.Accessors;
/**
- * @Description: 鎵规杩囩▼瓒嬪娍
+ * @Description: 宸ュ崟杩囩▼瓒嬪娍
* @Author: jeecg-boot
* @Date: 2023-03-08
* @Version: V1.0
@@ -25,7 +25,7 @@
@TableName("dry_order_trend")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="dry_order_trend瀵硅薄", description="鎵规杩囩▼瓒嬪娍")
+@ApiModel(value="dry_order_trend瀵硅薄", description="宸ュ崟杩囩▼瓒嬪娍")
public class DryOrderTrend implements Serializable {
private static final long serialVersionUID = 1L;
@@ -33,26 +33,64 @@
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private String id;
- /**鎵规*/
- @Excel(name = "鎵规", width = 15)
- @ApiModelProperty(value = "鎵规")
+ /**宸ュ崟*/
+ @Excel(name = "宸ュ崟", width = 15)
+ @ApiModelProperty(value = "宸ュ崟")
private String orderId;
/**鍚按鐜�*/
@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