From 0c03b83cc8e26963275d9ef16ea476ecdc035a0d Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 09 五月 2024 13:16:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
performance-server/src/main/java/com/yuanchu/mom/service/PerformanceShiftService.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/PerformanceShiftService.java b/performance-server/src/main/java/com/yuanchu/mom/service/PerformanceShiftService.java
index 7e9a5a5..5315122 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/service/PerformanceShiftService.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/service/PerformanceShiftService.java
@@ -4,10 +4,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.dto.PerformanceShiftAddDto;
+import com.yuanchu.mom.dto.PerformanceShiftMapDto;
import com.yuanchu.mom.pojo.PerformanceShift;
-
-import java.time.LocalDateTime;
-import java.util.Map;
/**
* <p>
@@ -21,7 +19,7 @@
void performanceShiftAdd(PerformanceShiftAddDto performanceShiftAddDto);
- IPage<Map<String, Object>> performanceShiftPage(Page<Object> page, LocalDateTime time, String userName, String laboratory);
+ IPage<PerformanceShiftMapDto> performanceShiftPage(Page<Object> page, String time, String userName, String laboratory);
void performanceShiftUpdate(String shift, Integer id);
}
--
Gitblit v1.9.3