From 43f0e69715099cfc8c8b8ea5284b874bfad14400 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 19 八月 2025 10:49:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/base/controller/FactoryController.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 cfb5a5a..d9f5488 100644
--- a/src/main/java/org/jeecg/modules/base/controller/FactoryController.java
+++ b/src/main/java/org/jeecg/modules/base/controller/FactoryController.java
@@ -222,9 +222,9 @@
}
@ApiOperation(value = "鑾峰彇鎵�鏈変骇绾垮垪琛�", notes = "鑾峰彇鎵�鏈変骇绾垮垪琛�")
- @GetMapping(value = "/queryProductionLineList")
- public Result<List<FactoryModel>> queryProductionLineList() {
- List<Factory> factoryList = factoryService.queryProductionLineList();
+ @GetMapping(value = "/queryUserProductionLineList")
+ public Result<List<FactoryModel>> queryUserProductionLineList() {
+ List<Factory> factoryList = factoryService.queryUserProductionLineList();
List<FactoryModel> factoryModels = factoryList.stream()
.map(factory -> new FactoryModel(factory.getId(), factory.getFactoryName()))
.collect(Collectors.toList());
--
Gitblit v1.9.3