From 39363e9edaf0b6961e9ed6777a19aa929a4fba7d Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 30 六月 2025 17:59:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/jeecg/modules/base/model/FactoryTreeModel.java |    3 +++
 1 files changed, 3 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..2adb268 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;
@@ -100,5 +102,6 @@
         this.updateBy = factory.getUpdateBy();
         this.updateTime = factory.getUpdateTime();
         this.mdcFlag = factory.getMdcFlag();
+        this.factoryCategory = factory.getFactoryCategory();
     }
 }

--
Gitblit v1.9.3