From 5194a4ffdb885cb6444ebe26c0e781d3c9054962 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期四, 29 五月 2025 15:52:16 +0800
Subject: [PATCH] 工具管理-DNC刀具查询接口
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolsClassify.java | 58 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 36 insertions(+), 22 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolsClassify.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolsClassify.java
index 22e7353..4c2215e 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolsClassify.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolsClassify.java
@@ -31,45 +31,70 @@
public class ToolsClassify implements Serializable {
private static final long serialVersionUID = 1L;
+
/**涓婚敭id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "涓婚敭id")
private String id;
+ /**鍒嗙被缂栫爜*/
+ @Excel(name = "鍒嗙被缂栫爜", width = 15)
+ @ApiModelProperty(value = "鍒嗙被缂栫爜")
+ private String classifyId;
/**绫诲瀷鍚嶇О*/
- @Excel(name = "绫诲瀷鍚嶇О", width = 15)
+ @Excel(name = "鍒嗙被鍚嶇О", width = 15)
@ApiModelProperty(value = "绫诲瀷鍚嶇О")
private String typeName;
+
/**鐖剁被鍨媔d*/
- @Excel(name = "鐖剁被鍨媔d", width = 15)
+ //@Excel(name = "鐖剁被鍨媔d", width = 15)
@ApiModelProperty(value = "鐖剁被鍨媔d")
private String parentId;
+
+ @Excel(name = "涓婄骇鍒嗙被缂栧彿", width = 15)
+ @TableField(exist = false)
+ private String parentNum;
+ @Excel(name = "涓婄骇鍒嗙被鍚嶇О", width = 15)
+ @TableField(exist = false)
+ private String parentName;
/**鏄剧ず搴忓彿*/
- @Excel(name = "鏄剧ず搴忓彿", width = 15)
+ //@Excel(name = "鏄剧ず搴忓彿", width = 15)
@ApiModelProperty(value = "鏄剧ず搴忓彿")
private String seq;
/**鐘舵�侊紙1.鍚敤锛�2.鍏抽棴锛�*/
- @Excel(name = "鐘舵�侊紙1.鍚敤锛�2.鍏抽棴锛�", width = 15)
+ //@Excel(name = "鐘舵�侊紙1.鍚敤锛�2.鍏抽棴锛�", width = 15)
@ApiModelProperty(value = "鐘舵�侊紙1.鍚敤锛�2.鍏抽棴锛�")
private String status;
/**鏄惁鏄彾瀛愯妭鐐�*/
- @Excel(name = "鏄惁鏄彾瀛愯妭鐐�", width = 15)
+ //@Excel(name = "鏄惁鏄彾瀛愯妭鐐�", width = 15)
@ApiModelProperty(value = "鏄惁鏄彾瀛愯妭鐐�")
private String leafFlag;
/**灞傜骇*/
- @Excel(name = "灞傜骇", width = 15)
+ //@Excel(name = "灞傜骇", width = 15)
@ApiModelProperty(value = "灞傜骇")
private String rank;
/**瀵瑰簲鍙傛暟妯℃澘琛ㄥ悕绉�*/
- @Excel(name = "瀵瑰簲鍙傛暟妯℃澘琛ㄥ悕绉�", width = 15)
+ //@Excel(name = "瀵瑰簲鍙傛暟妯℃澘琛ㄥ悕绉�", width = 15)
@ApiModelProperty(value = "瀵瑰簲鍙傛暟妯℃澘琛ㄥ悕绉�")
@Dict(dicCode = "tool_para_type")
private String paraTypeFlag;
- /**澶囨敞*/
+
+ /**鍔犲伐涓績鍒�鍏风畝绉�*/
+ @ApiModelProperty(value = "鍔犲伐涓績鍒�鍏风畝绉�")
+ private String aliasLabel;
+
+ @ApiModelProperty(value = "宸ュ叿鍒嗙被缂栫爜鏂瑰紡")
+ private String encodingType;
+
+ @Excel(name = "鍙傛暟妯℃澘", width = 15)
+ @TableField(exist = false)
+ private String paraTypeFlagName;
+
+ /**澶囨敞*/
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
private String remark;
/**绉熸埛鍙�*/
- @Excel(name = "绉熸埛鍙�", width = 15)
+ //@Excel(name = "绉熸埛鍙�", width = 15)
@ApiModelProperty(value = "绉熸埛鍙�")
private String tenantId;
/**鍒涘缓浜�*/
@@ -83,25 +108,14 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
private Date createTime;
/**鏇存柊浜�*/
- @Excel(name = "鏇存柊浜�", width = 15)
+ //@Excel(name = "鏇存柊浜�", width = 15)
@ApiModelProperty(value = "鏇存柊浜�")
private String updateBy;
/**鏇存柊鏃堕棿*/
- @Excel(name = "鏇存柊鏃堕棿", width = 15, format = "yyyy-MM-dd")
+ //@Excel(name = "鏇存柊鏃堕棿", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "鏇存柊鏃堕棿")
private Date updateTime;
- /**鍒嗙被缂栫爜*/
- @Excel(name = "鍒嗙被缂栫爜", width = 15)
- @ApiModelProperty(value = "鍒嗙被缂栫爜")
- private String classifyId;
-
- @TableField(exist = false)
- private String parentNum;
- @TableField(exist = false)
- private String parentName;
- @TableField(exist = false)
- private String paraTypeFlagName;
}
--
Gitblit v1.9.3