From 87b161325d9186d8211a7d472ed04fa279f33954 Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei>
Date: 星期五, 14 十一月 2025 16:12:43 +0800
Subject: [PATCH] Merge branch 'master' of http://lanpucloud.cn:1111/r/herb
---
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHerbFormula.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHerbFormula.java b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHerbFormula.java
index a04fef7..14ebc66 100755
--- a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHerbFormula.java
+++ b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHerbFormula.java
@@ -36,13 +36,13 @@
@ApiModelProperty(value = "id")
private String id;
/**閰嶆柟缂栧彿*/
- @Excel(name = "閰嶆柟缂栧彿", width = 15)
+
@ApiModelProperty(value = "閰嶆柟缂栧彿")
private String code;
/**鑽潗id*/
- @Excel(name = "鑽潗id", width = 15, dictTable = "dry_herb_info", dicText = "name", dicCode = "id")
+ @Excel(name = "鑽潗", width = 15, dictTable = "dry_herb_info", dicText = "name", dicCode = "id")
@Dict(dictTable = "dry_herb_info", dicText = "name", dicCode = "id")
- @ApiModelProperty(value = "鑽潗id")
+ @ApiModelProperty(value = "鑽潗")
private String herbId;
/**閰嶆柟鍚嶇О*/
@Excel(name = "閰嶆柟鍚嶇О", width = 15)
@@ -53,7 +53,7 @@
@ApiModelProperty(value = "缂╁啓")
private String abbr;
/**鑽潗鎷奸煶*/
- @Excel(name = "鑽潗鎷奸煶", width = 15)
+
@ApiModelProperty(value = "鑽潗鎷奸煶")
private String pinyin;
/**璁惧绫诲瀷*/
@@ -70,7 +70,7 @@
@ApiModelProperty(value = "杞昏川鐗╂枡")
private String light;
/**閰嶆柟鍒嗙被*/
- @Excel(name = "閰嶆柟鍒嗙被", width = 15)
+// @Excel(name = "閰嶆柟鍒嗙被", width = 15)
@ApiModelProperty(value = "閰嶆柟鍒嗙被")
private String category;
/**鍒濆鍚按鐜�*/
@@ -98,11 +98,11 @@
@ApiModelProperty(value = "鍒濆椋庢満棰戠巼")
private Integer fanSpeed;
/**鐜娓╁害*/
- @Excel(name = "鐜娓╁害", width = 15)
+
@ApiModelProperty(value = "鐜娓╁害")
private Double envTemp;
/**鐜婀垮害*/
- @Excel(name = "鐜婀垮害", width = 15)
+
@ApiModelProperty(value = "鐜婀垮害")
private Double envHum;
/**缈绘枡绛栫暐*/
@@ -110,15 +110,15 @@
@ApiModelProperty(value = "缈绘枡绛栫暐")
private String strategy;
/**鑽℃枡寤舵椂ms*/
- @Excel(name = "鑽℃枡寤舵椂ms", width = 15)
+
@ApiModelProperty(value = "鑽℃枡寤舵椂ms")
private Integer delay;
/**缈绘枡娆℃暟*/
- @Excel(name = "缈绘枡娆℃暟", width = 15)
+
@ApiModelProperty(value = "缈绘枡娆℃暟")
private Integer turn;
/**鍚按鐜囪ˉ鍋�*/
- @Excel(name = "鍚按鐜囪ˉ鍋�", width = 15)
+// @Excel(name = "鍚按鐜囪ˉ鍋�", width = 15)
@ApiModelProperty(value = "鍚按鐜囪ˉ鍋�")
private Double moisOffset;
@@ -126,8 +126,14 @@
@Excel(name = "鍐烽鏃堕暱", width = 15)
@ApiModelProperty(value = "鍐烽鏃堕暱")
private Integer coolingDuration;
+
+
+ /**鏄惁鍚敤*/
+ @Excel(name = "鏄惁鍚敤", width = 15)
+ @ApiModelProperty(value = "鏄惁鍚敤")
+ private String enabled;
+
/**绉熸埛id*/
- @Excel(name = "绉熸埛id", width = 15)
@ApiModelProperty(value = "绉熸埛id")
private Integer tenantId;
/**鍒涘缓浜�*/
--
Gitblit v1.9.3