From 46e512321221b9ae01a513f04c80a8f73f20e0a0 Mon Sep 17 00:00:00 2001
From: bsw215583320 <baoshiwei121@163.com>
Date: 星期四, 07 十一月 2024 08:48:55 +0800
Subject: [PATCH] 增加设备信息获取mqtt主题和订阅,租户上传设备实时数据时,若服务端无相关设备信息,可通过此接口获取

---
 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
index b808768..8725ed9 100644
--- 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