From 212eb8010c66c321dcdfc617725b37885573a44e Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 02 七月 2025 21:20:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductMix.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 f390a20..2df2138 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")
@@ -43,19 +41,21 @@
//灞曠ず鍚嶇О
private transient String label;
- //绫诲瀷 鏂逛究鍓嶇灞曠ず
+ //绫诲瀷鏂逛究鍓嶇灞曠ず
private transient Integer type;
+
private transient List<ProductMix> children = new ArrayList<>();
- public ProductMix(Long id, Long parentId, String treeName, String trrCode, 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.treeName = treeName;
- this.treeCode = trrCode;
+ this.treeCode = treeCode;
this.type = type;
+ this.treeType = type;
this.children = new ArrayList<>();
- this.label="["+ trrCode +"]"+ treeName;
+ this.label="["+treeCode+"]"+treeName;
this.createTime = createTime;
}
--
Gitblit v1.9.3