From 0e19bbb301fd4efdcbf3285ade2a149db7d0a613 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 15 八月 2025 18:34:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/base/model/FactoryTreeModel.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/base/model/FactoryTreeModel.java b/src/main/java/org/jeecg/modules/base/model/FactoryTreeModel.java
index 8138de7..53c6621 100644
--- a/src/main/java/org/jeecg/modules/base/model/FactoryTreeModel.java
+++ b/src/main/java/org/jeecg/modules/base/model/FactoryTreeModel.java
@@ -58,6 +58,8 @@
private String factoryCode;
+ private String factoryCategory;
+
private String remark;
private Integer delFlag;
@@ -71,6 +73,8 @@
private Date updateTime;
private String mdcFlag;
+
+ private String productionType;
private List<FactoryTreeModel> children = new ArrayList<>();
@@ -100,5 +104,7 @@
this.updateBy = factory.getUpdateBy();
this.updateTime = factory.getUpdateTime();
this.mdcFlag = factory.getMdcFlag();
+ this.factoryCategory = factory.getFactoryCategory();
+ this.productionType = factory.getProductionType();
}
}
--
Gitblit v1.9.3