From b1b59aac99c3d465d51e5fb4f7ab8185ddb733d2 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 16 十二月 2025 17:24:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hckx' into hckx
---
src/main/java/com/ruoyi/home/service/HomeService.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/service/HomeService.java b/src/main/java/com/ruoyi/home/service/HomeService.java
index 49e7530..266a8ce 100644
--- a/src/main/java/com/ruoyi/home/service/HomeService.java
+++ b/src/main/java/com/ruoyi/home/service/HomeService.java
@@ -6,7 +6,9 @@
import com.ruoyi.home.dto.QualityStatisticsDto;
import com.ruoyi.home.dto.StatisticsReceivablePayableDto;
+import java.text.ParseException;
import java.util.List;
+import java.util.Map;
/**
* @author :yys
@@ -22,7 +24,9 @@
QualityStatisticsDto qualityStatistics();
- List<ApproveProcess> todos();
+ List<ApproveProcess> todos() throws ParseException;
StatisticsReceivablePayableDto statisticsReceivablePayable(Integer type);
+
+ Map<String, Object> approveAndDeviceTodos();
}
--
Gitblit v1.9.3