From f95d05316d49bcdd31d022a11d0fc4fbafb040da Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期一, 08 九月 2025 11:40:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/base/controller/FactoryController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/base/controller/FactoryController.java b/src/main/java/org/jeecg/modules/base/controller/FactoryController.java
index d9f5488..ed9c6b6 100644
--- a/src/main/java/org/jeecg/modules/base/controller/FactoryController.java
+++ b/src/main/java/org/jeecg/modules/base/controller/FactoryController.java
@@ -226,7 +226,7 @@
public Result<List<FactoryModel>> queryUserProductionLineList() {
List<Factory> factoryList = factoryService.queryUserProductionLineList();
List<FactoryModel> factoryModels = factoryList.stream()
- .map(factory -> new FactoryModel(factory.getId(), factory.getFactoryName()))
+ .map(factory -> new FactoryModel(factory.getId(), factory.getFactoryName(), factory.getProductionType()))
.collect(Collectors.toList());
return Result.ok(factoryModels);
}
--
Gitblit v1.9.3