From a3344947e1ff54fcae8f09140ab0d05e2ba26f31 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期五, 25 十月 2024 15:17:36 +0800
Subject: [PATCH] 新增配方记录功能并优化相关实体和VO
---
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHerbFormula.java | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 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 5c4c4aa..6a3d545 100644
--- 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,20 +36,32 @@
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private String id;
+ /**閰嶆柟缂栧彿*/
+ @Excel(name = "閰嶆柟缂栧彿", width = 15)
+ @ApiModelProperty(value = "閰嶆柟缂栧彿")
+ private String code;
/**鑽潗id*/
- @Excel(name = "鑽潗id", width = 15, dictTable = "dry_herb", dicText = "name", dicCode = "id")
- @Dict(dictTable = "dry_herb", dicText = "name", dicCode = "id")
+ @Excel(name = "鑽潗id", width = 15, dictTable = "dry_herb_info", dicText = "name", dicCode = "id")
+ @Dict(dictTable = "dry_herb_info", dicText = "name", dicCode = "id")
@ApiModelProperty(value = "鑽潗id")
private String herbId;
- /**鑽潗鍚嶇О*/
- @Excel(name = "鑽潗鍚嶇О", width = 15)
- @ApiModelProperty(value = "鑽潗鍚嶇О")
- private String herbName;
+ /**閰嶆柟鍚嶇О*/
+ @Excel(name = "閰嶆柟鍚嶇О", width = 15)
+ @ApiModelProperty(value = "閰嶆柟鍚嶇О")
+ private String name;
+ /**鑽潗鎷奸煶*/
+ @Excel(name = "鑽潗鎷奸煶", width = 15)
+ @ApiModelProperty(value = "鑽潗鎷奸煶")
+ private String pinyin;
/**璁惧绫诲瀷*/
@Excel(name = "璁惧绫诲瀷", width = 15, dictTable = "dry_eqp_type", dicText = "name", dicCode = "id")
@Dict(dictTable = "dry_eqp_type", dicText = "name", dicCode = "id")
@ApiModelProperty(value = "璁惧绫诲瀷")
private String eqpType;
+ /**閰嶆柟鍒嗙被*/
+ @Excel(name = "閰嶆柟鍒嗙被", width = 15)
+ @ApiModelProperty(value = "閰嶆柟鍒嗙被")
+ private String category;
/**鐩爣鍚按鐜�*/
@Excel(name = "鐩爣鍚按鐜�", width = 15)
@ApiModelProperty(value = "鐩爣鍚按鐜�")
@@ -66,6 +78,10 @@
@Excel(name = "鐑娓╁害", width = 15)
@ApiModelProperty(value = "鐑娓╁害")
private Double windTemp;
+ /**鍒濆椋庢満棰戠巼*/
+ @Excel(name = "鍒濆椋庢満棰戠巼", width = 15)
+ @ApiModelProperty(value = "鍒濆椋庢満棰戠巼")
+ private Integer fanSpeed;
/**鐜娓╁害*/
@Excel(name = "鐜娓╁害", width = 15)
@ApiModelProperty(value = "鐜娓╁害")
@@ -82,6 +98,15 @@
@Excel(name = "缈绘枡娆℃暟", width = 15)
@ApiModelProperty(value = "缈绘枡娆℃暟")
private Integer turn;
+ /**鍚按鐜囪ˉ鍋�*/
+ @Excel(name = "鍚按鐜囪ˉ鍋�", width = 15)
+ @ApiModelProperty(value = "鍚按鐜囪ˉ鍋�")
+ private Double moisOffset;
+
+ /**鍐烽鏃堕暱*/
+ @Excel(name = "鍐烽鏃堕暱", width = 15)
+ @ApiModelProperty(value = "鍐烽鏃堕暱")
+ private Integer coolingDuration;
/**绉熸埛id*/
@Excel(name = "绉熸埛id", width = 15)
@ApiModelProperty(value = "绉熸埛id")
--
Gitblit v1.9.3