From eeb8d7faa8d25b3ca9fe75ef28f035c49af5b06d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 11 三月 2025 11:05:38 +0800
Subject: [PATCH] Merge branch 'dev' into dev_zj
---
performance-server/src/main/java/com/ruoyi/performance/service/PerformanceShiftService.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/performance-server/src/main/java/com/ruoyi/performance/service/PerformanceShiftService.java b/performance-server/src/main/java/com/ruoyi/performance/service/PerformanceShiftService.java
index dce8d3a..ae925b9 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/service/PerformanceShiftService.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/service/PerformanceShiftService.java
@@ -6,6 +6,7 @@
import com.ruoyi.performance.dto.PerformanceShiftAddDto;
import com.ruoyi.performance.pojo.PerformanceShift;
+import java.util.List;
import java.util.Map;
/**
@@ -29,4 +30,7 @@
Map<Object, Object> exportToYearExcel(String time, String userName, String laboratory) throws Exception;
Map<Object, Object> exportToMonthExcel(String time, String userName, String laboratory);
+
+ Map<String, List<Map<String,Object>>> getUserList();
+
}
--
Gitblit v1.9.3