From ff181c705c98885282668990c84219d17e04be0b Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 15:10:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/java/com/ruoyi/home/controller/HomeController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/controller/HomeController.java b/src/main/java/com/ruoyi/home/controller/HomeController.java
index 62f6715..3224c0f 100644
--- a/src/main/java/com/ruoyi/home/controller/HomeController.java
+++ b/src/main/java/com/ruoyi/home/controller/HomeController.java
@@ -99,7 +99,7 @@
@GetMapping("/workInProcessTurnover")
@ApiOperation("鍦ㄥ埗鍝佸懆杞儏鍐�")
public AjaxResult workInProcessTurnover(){
- Map<Integer, List<ProductWorkOrderDto>> productWorkOrderDtoMap = homeService.workInProcessTurnover();
- return AjaxResult.success(productWorkOrderDtoMap);
+ ProductionTurnoverDto productionTurnoverDto = homeService.workInProcessTurnover();
+ return AjaxResult.success(productionTurnoverDto);
}
}
--
Gitblit v1.9.3