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 | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 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 d49a1f1..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
@@ -2,17 +2,17 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
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;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
-@Getter
@Data
@NoArgsConstructor
@TableName(value = "nc_product_mix")
@@ -26,33 +26,59 @@
@TableField(value = "parent_id")
private Long parentId;
// 鍚嶇О
- @TableField(value = "name")
- private String name;
+ @TableField(value = "tree_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;
//灞曠ず鍚嶇О
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) {
+ 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.treeType = type;
this.children = new ArrayList<>();
- this.label="["+code+"]"+name;
+ this.label="["+treeCode+"]"+treeName;
+ this.createTime = createTime;
}
public void addChild(ProductMix child) {
this.children.add(child);
}
+
+ public ProductMix(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ @Override
+ public String toString() {
+ return "ProductMix{createTime=" + createTime + '}';
+ }
+
}
--
Gitblit v1.9.3