From cd00884c3db8fa6808b3b5949ab1a2b1459d6bdc Mon Sep 17 00:00:00 2001 From: cuilei <ray_tsu1@163.com> Date: 星期三, 11 六月 2025 10:36:55 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/BaseTools.java | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/BaseTools.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/BaseTools.java index 7eaf241..d99691d 100644 --- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/BaseTools.java +++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/BaseTools.java @@ -63,19 +63,27 @@ /**鏍囨敞绾у埆*/ @Excel(name = "鏍囨敞绾у埆", width = 15) @ApiModelProperty(value = "鏍囨敞绾у埆") - private String repairCount; + private String standardLevel; /**鏍囧噯鍙�*/ @Excel(name = "鏍囧噯鍙�", width = 15) @ApiModelProperty(value = "鏍囧噯鍙�") - private String detectionCount; + private String standardCode; /**鍨嬪彿/鍥惧彿*/ @Excel(name = "鍨嬪彿/鍥惧彿", width = 15) @ApiModelProperty(value = "鍨嬪彿/鍥惧彿") - private String lendCount; + private String toolModel; /**鍙傛暟琛ㄥ悕绉�*/ @Excel(name = "鍙傛暟琛ㄥ悕绉�", width = 15) @ApiModelProperty(value = "鍙傛暟琛ㄥ悕绉�") private String paramaTableName; + /**绮惧害绛夌骇*/ + @Excel(name = "绮惧害绛夌骇锛�1:A;2:B;3:C锛�", width = 15) + @ApiModelProperty(value = "绮惧害绛夌骇锛�1:A;2:B;3:C锛�") + private String accuracyClass; + /**褰撳墠缂栫爜*/ + @Excel(name = "褰撳墠缂栫爜", width = 15) + @ApiModelProperty(value = "褰撳墠缂栫爜") + private String currentCode; /**澶囨敞*/ @Excel(name = "澶囨敞", width = 15) @ApiModelProperty(value = "澶囨敞") @@ -100,4 +108,9 @@ @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "鏇存柊鏃堕棿") private Date updateTime; + + /**宸ュ叿鍥剧墖*/ + @Excel(name = "宸ュ叿鍥剧墖", width = 15) + @ApiModelProperty(value = "宸ュ叿鍥剧墖") + private String toolPicture; } -- Gitblit v1.9.3