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 | 5 +++--
1 files changed, 3 insertions(+), 2 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 65cf82c..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;
/**鎿嶄綔浜�*/
@@ -156,5 +157,5 @@
/**鐢佃兘娑堣��*/
@ApiModelProperty(value = "鐢佃兘娑堣��")
- private Double electric;
+ private Double watt;
}
--
Gitblit v1.9.3