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/DryHerbInfo.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHerbInfo.java b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHerbInfo.java
old mode 100644
new mode 100755
index b808768..8725ed9
--- a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHerbInfo.java
+++ b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHerbInfo.java
@@ -9,6 +9,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@@ -49,6 +50,11 @@
@Excel(name = "鑻辨枃鍚�", width = 15)
@ApiModelProperty(value = "鑻辨枃鍚�")
private String english;
+ /**鑽潗鍒嗙被*/
+ @Excel(name = "鑽潗鍒嗙被", width = 15, dictTable = "dry_herb_type", dicText = "name", dicCode = "id")
+ @Dict(dictTable = "dry_herb_type", dicText = "name", dicCode = "id")
+ @ApiModelProperty(value = "鑽潗鍒嗙被")
+ private String type;
/**鑽敤閮ㄤ綅*/
@Excel(name = "鑽敤閮ㄤ綅", width = 15)
@ApiModelProperty(value = "鑽敤閮ㄤ綅")
--
Gitblit v1.9.3