From 609dc04b7262c229653775015ecd4334f679589b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 03 二月 2026 10:21:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/home/service/HomeService.java | 7 ++++---
1 files changed, 4 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 1b9da60..a2e113d 100644
--- a/src/main/java/com/ruoyi/home/service/HomeService.java
+++ b/src/main/java/com/ruoyi/home/service/HomeService.java
@@ -31,6 +31,7 @@
Long noticesCount();
ProductionProgressDto productionProgress();
+
ProductionTurnoverDto workInProcessTurnover();
DeptStaffDistributionDto deptStaffDistribution();
@@ -75,11 +76,11 @@
List<MapDto> orderCount();
- List<QualityQualifiedAnalysisDto> rawMaterialDetection(Integer type);
+ QualityQualifiedAnalysisDto rawMaterialDetection(Integer type);
- List<QualityQualifiedAnalysisDto> processDetection(Integer type);
+ QualityQualifiedAnalysisDto processDetection(Integer type);
- List<QualityQualifiedAnalysisDto> factoryDetection(Integer type);
+ QualityQualifiedAnalysisDto factoryDetection(Integer type);
QualityInspectionCountDto qualityInspectionCount();
--
Gitblit v1.9.3