From 339515558253d776769dc2e2560bbb4a0450c989 Mon Sep 17 00:00:00 2001 From: zhuguifei <zhuguifei@zhuguifeideiMac.local> Date: 星期五, 29 十一月 2024 09:44:44 +0800 Subject: [PATCH] 将码云版本提交至gitlab -- 20241129 --- jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryHerbInfoVo.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/vo/DryHerbInfoVo.java b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryHerbInfoVo.java old mode 100644 new mode 100755 index 886bfaa..1f2af1c --- a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryHerbInfoVo.java +++ b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryHerbInfoVo.java @@ -6,6 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.ToString; +import org.jeecg.common.aspect.annotation.Dict; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; @@ -39,6 +40,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