From a3344947e1ff54fcae8f09140ab0d05e2ba26f31 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期五, 25 十月 2024 15:17:36 +0800
Subject: [PATCH] 新增配方记录功能并优化相关实体和VO

---
 jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrder.java |    3 ++-
 1 files changed, 2 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
index 33cd2e2..29ac2c8 100644
--- 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;
 	/**鎿嶄綔浜�*/

--
Gitblit v1.9.3