From 1f1ef0f62c4953e3ff9c610cda8f3c4f8a45c025 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 20 一月 2026 14:34:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into hsxny-new

---
 src/main/java/com/ruoyi/home/service/HomeService.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/home/service/HomeService.java b/src/main/java/com/ruoyi/home/service/HomeService.java
index 9017de6..e950e20 100644
--- a/src/main/java/com/ruoyi/home/service/HomeService.java
+++ b/src/main/java/com/ruoyi/home/service/HomeService.java
@@ -31,9 +31,8 @@
 
     Long noticesCount();
 
-     ProductionProgressDto productionProgress();
-     Map<Integer, List<ProductWorkOrderDto>> workInProcessTurnover();
-
+    ProductionProgressDto productionProgress();
+    ProductionTurnoverDto workInProcessTurnover();
 
     Long overdueReceivable();
 }

--
Gitblit v1.9.3