From a0a030ec98b711e82720be38c6ea9ddf4a07a22b Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期五, 25 七月 2025 15:08:23 +0800
Subject: [PATCH] Merge branch 'master' of http://lanpucloud.cn:1111/r/herb
---
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryEquipment.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryEquipment.java b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryEquipment.java
index 1007d45..2a8392b 100755
--- a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryEquipment.java
+++ b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryEquipment.java
@@ -91,6 +91,35 @@
@ApiModelProperty(value = "璁惧IP")
private String ip;
+ /**鍒堕�犲晢*/
+ @Excel(name = "鍒堕�犲晢", width = 15)
+ @ApiModelProperty(value = "鍒堕�犲晢")
+ private String manufacturer;
+ /**璐叆鏃ユ湡*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "璐叆鏃ユ湡")
+ private Date purchaseDate;
+ /**鍚敤鏃ユ湡*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鍚敤鏃ユ湡")
+ private Date startDate;
+ /**瀹夎浣嶇疆*/
+ @Excel(name = "瀹夎浣嶇疆", width = 15)
+ @ApiModelProperty(value = "瀹夎浣嶇疆")
+ private String location;
+ /**璁惧鐘舵��*/
+ @Excel(name = "璁惧鐘舵��", width = 15, dicCode = "eqp_status")
+ @Dict(dicCode = "eqp_status")
+ @ApiModelProperty(value = "璁惧鐘舵��")
+ private String status;
+ /**鎶ュ簾鏃ユ湡*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鎶ュ簾鏃ユ湡")
+ private Date scrapDate;
+
public DryEquipment() {
}
public DryEquipment(RealTimeDataVo realTimeDataVo) {
--
Gitblit v1.9.3