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/DryOrder.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrder.java b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrder.java
old mode 100644
new mode 100755
index 29c3e0b..29ac2c8
--- a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrder.java
+++ b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrder.java
@@ -48,7 +48,7 @@
     private String code;
 	/**鑽潗*/
 	@Excel(name = "鑽潗", width = 15, dictTable = "dry_herb", dicText = "name", dicCode = "id")
-	@Dict(dictTable = "dry_herb", dicText = "name", dicCode = "id")
+	@Dict(dictTable = "dry_herb_formula", dicText = "name", dicCode = "id")
     @ApiModelProperty(value = "鑽潗")
     private String herbId;
     /**鑽潗*/
@@ -138,6 +138,7 @@
     private Date updateTime;
 	/**宸ュ崟鐘舵��*/
 	@Excel(name = "宸ュ崟鐘舵��", width = 15)
+    @Dict(dicCode = "dry_order_status")
     @ApiModelProperty(value = "宸ュ崟鐘舵��")
     private Integer orderStatus;
 	/**鎿嶄綔浜�*/
@@ -146,5 +147,15 @@
     @ApiModelProperty(value = "鎿嶄綔浜�")
     private String operator;
 
+    /**娓╁害瓒嬪娍*/
+    @ApiModelProperty(value = "娓╁害瓒嬪娍")
     private String temps;
+
+    /**钂告苯娑堣��*/
+    @ApiModelProperty(value = "钂告苯娑堣��")
+    private Double steam;
+
+    /**鐢佃兘娑堣��*/
+    @ApiModelProperty(value = "鐢佃兘娑堣��")
+    private Double watt;
 }

--
Gitblit v1.9.3