From cf17e9b3e34d1f14f5b9ed41e4eeb82c744cb218 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 22 一月 2026 14:18:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' 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