From bc8cd378fd72f43e66120c540f57f630580aa093 Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期四, 11 九月 2025 10:57:13 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamPrecisionParameters.java | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamPrecisionParameters.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamPrecisionParameters.java index 4c72d1d..f2e3b56 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamPrecisionParameters.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamPrecisionParameters.java @@ -58,4 +58,11 @@ @ApiModelProperty(value = "鍙傛暟鍒嗙被") @Dict(dicCode = "precision_parameters_category") private String parameterCategory; + /** + * 璁惧绉嶇被 + */ + @Excel(name = "璁惧绉嶇被", width = 15, dictTable = "sys_category", dicCode = "code", dicText = "name") + @ApiModelProperty(value = "璁惧绉嶇被") + @Dict(dictTable = "sys_category", dicCode = "code", dicText = "name") + private String equipmentType; } -- Gitblit v1.9.3