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 | 69 ++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 28 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 bae6cf8..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
@@ -48,38 +48,46 @@
@Excel(name = "宸ュ叿缂栧彿", width = 15)
@ApiModelProperty(value = "宸ュ叿缂栧彿")
private String toolId;
- /**鎬诲簱瀛�*/
- @Excel(name = "鎬诲簱瀛�", width = 15)
- @ApiModelProperty(value = "鎬诲簱瀛�")
- private BigDecimal totalCount;
- /**鍙敤搴撳瓨*/
- @Excel(name = "鍙敤搴撳瓨", width = 15)
- @ApiModelProperty(value = "鍙敤搴撳瓨")
- private BigDecimal availableCount;
- /**鎬绘姤鎹熸暟閲�*/
- @Excel(name = "鎬绘姤鎹熸暟閲�", width = 15)
- @ApiModelProperty(value = "鎬绘姤鎹熸暟閲�")
- private BigDecimal lossCount;
- /**鍦ㄤ慨鏁伴噺*/
- @Excel(name = "鍦ㄤ慨鏁伴噺", width = 15)
- @ApiModelProperty(value = "鍦ㄤ慨鏁伴噺")
- private BigDecimal repairCount;
- /**鍦ㄦ*/
- @Excel(name = "鍦ㄦ", width = 15)
- @ApiModelProperty(value = "鍦ㄦ")
- private BigDecimal detectionCount;
- /**鍦ㄥ��*/
- @Excel(name = "鍦ㄥ��", width = 15)
- @ApiModelProperty(value = "鍦ㄥ��")
- private BigDecimal lendCount;
- /**鍦ㄧ（*/
- @Excel(name = "鍦ㄧ（", width = 15)
- @ApiModelProperty(value = "鍦ㄧ（")
- private BigDecimal sharpeningCount;
+ /**搴忓彿锛堟垨浼佷笟鍐呯爜锛�*/
+ @Excel(name = "搴忓彿锛堟垨浼佷笟鍐呯爜锛�", width = 15)
+ @ApiModelProperty(value = "搴忓彿锛堟垨浼佷笟鍐呯爜锛�")
+ private String signCode;
+ /**涓枃鍚嶇О*/
+ @Excel(name = "涓枃鍚嶇О", width = 15)
+ @ApiModelProperty(value = "涓枃鍚嶇О")
+ private String chineseName;
+ /**澶栨枃鍚嶇О*/
+ @Excel(name = "澶栨枃鍚嶇О", width = 15)
+ @ApiModelProperty(value = "澶栨枃鍚嶇О")
+ private String foreignLanguageName;
+ /**鏍囨敞绾у埆*/
+ @Excel(name = "鏍囨敞绾у埆", width = 15)
+ @ApiModelProperty(value = "鏍囨敞绾у埆")
+ private String standardLevel;
+ /**鏍囧噯鍙�*/
+ @Excel(name = "鏍囧噯鍙�", width = 15)
+ @ApiModelProperty(value = "鏍囧噯鍙�")
+ private String standardCode;
+ /**鍨嬪彿/鍥惧彿*/
+ @Excel(name = "鍨嬪彿/鍥惧彿", width = 15)
+ @ApiModelProperty(value = "鍨嬪彿/鍥惧彿")
+ 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 = "澶囨敞")
+ private String remark;
/**绉熸埛鍙�*/
@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