From e620584c3286579a7f89ff73d227f58d721d6798 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 20 一月 2026 11:21:16 +0800
Subject: [PATCH] Merge branch 'jtwy' into dev_New

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

diff --git a/src/main/java/com/ruoyi/home/service/HomeService.java b/src/main/java/com/ruoyi/home/service/HomeService.java
index 010e8c1..2dbab27 100644
--- a/src/main/java/com/ruoyi/home/service/HomeService.java
+++ b/src/main/java/com/ruoyi/home/service/HomeService.java
@@ -31,6 +31,6 @@
 
     Long noticesCount();
 
-     ProductionProgressDto productionProgress();
-     Map<Integer, List<ProductWorkOrderDto>> workInProcessTurnover();
+    ProductionProgressDto productionProgress();
+    ProductionTurnoverDto workInProcessTurnover();
 }

--
Gitblit v1.9.3