From e2a02c09b9d087a49ae5dd9f70856967390237de Mon Sep 17 00:00:00 2001 From: bsw215583320 <baoshiwei121@163.com> Date: 星期五, 01 十一月 2024 16:54:23 +0800 Subject: [PATCH] 兼容机台自建配方,实时数据通过mqtt转发 --- 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 index 886bfaa..1f2af1c 100644 --- 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