From f41e49b7afc557ab9717abb4888dab139d7de587 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期四, 24 七月 2025 15:20:55 +0800
Subject: [PATCH] feat(dry): 新增设备维护和维修记录功能,设备主数据新增了制造商、购入日期、启用日期、安装位置、设备状态和报废日期等字段

---
 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