From 443a9510ba9c032d83139048f73201706a1d9c45 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 10 五月 2024 22:19:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
performance-server/src/main/java/com/yuanchu/mom/mapper/PerformanceShiftMapper.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/performance-server/src/main/java/com/yuanchu/mom/mapper/PerformanceShiftMapper.java b/performance-server/src/main/java/com/yuanchu/mom/mapper/PerformanceShiftMapper.java
index f9ef663..2623b39 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/mapper/PerformanceShiftMapper.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/mapper/PerformanceShiftMapper.java
@@ -30,4 +30,8 @@
List<Map<String, Object>> performanceShiftYearPage(@Param("time") String time,
@Param("userName") String userName,
@Param("laboratory") String laboratory);
+
+ IPage<Map<String, Object>> performanceShiftYear(Page<Object> page, String time, String userName, String laboratory);
+
+ List<Map<String, Object>> performanceShiftYearList(String time, String userName, String laboratory);
}
--
Gitblit v1.9.3