From 24e0bdd24a10449c98013cdb5bcc5e37735f5a91 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 16 六月 2025 09:04:01 +0800
Subject: [PATCH] 对接刀具系统，涉密网封装结构树与文件
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductMix.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductMix.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductMix.java
index 81e49a1..879114e 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductMix.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductMix.java
@@ -6,7 +6,6 @@
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
-import lombok.Getter;
import lombok.NoArgsConstructor;
import java.io.Serializable;
@@ -14,7 +13,6 @@
import java.util.Date;
import java.util.List;
-@Getter
@Data
@NoArgsConstructor
@TableName(value = "nc_product_mix")
@@ -29,13 +27,13 @@
private Long parentId;
// 鍚嶇О
@TableField(value = "tree_name")
- private String name;
+ private String treeName;
// code
@TableField(value = "tree_code")
- private String code;
+ private String treeCode;
// 绫诲瀷
@TableField(value = "tree_type")
- private Integer type;
+ private Integer treeType;
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
@TableField(value = "create_time")
private Date createTime;
@@ -43,17 +41,20 @@
//灞曠ず鍚嶇О
private transient String label;
+ //绫诲瀷鏂逛究鍓嶇灞曠ず
+ private transient Integer type;
+
private transient List<ProductMix> children = new ArrayList<>();
- public ProductMix(Long id, Long parentId, String name, String code, Integer type, Date createTime) {
+ public ProductMix(Long id, Long parentId, String treeName, String treeCode, Integer type, Date createTime) {
this.id = id;
this.parentId = parentId;
- this.name = name;
- this.code = code;
+ this.treeName = treeName;
+ this.treeCode = treeCode;
this.type = type;
this.children = new ArrayList<>();
- this.label="["+code+"]"+name;
+ this.label="["+treeCode+"]"+treeName;
this.createTime = createTime;
}
--
Gitblit v1.9.3