From 7c585586e9bea943161676bd9d127e81123891c3 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 11 十二月 2024 11:01:35 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' into herb
---
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
old mode 100644
new mode 100755
index 33cd2e2..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;
/**鎿嶄綔浜�*/
--
Gitblit v1.9.3