From 39f799b4eb5aad2d6fbe11f4154f879e51a45039 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 09 五月 2024 15:48:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
performance-server/src/main/java/com/yuanchu/mom/service/PerformanceShiftService.java | 5 ++---
1 files changed, 2 insertions(+), 3 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 1274d30..67ad72a 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
@@ -1,6 +1,5 @@
package com.yuanchu.mom.service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.dto.PerformanceShiftAddDto;
@@ -20,7 +19,7 @@
void performanceShiftAdd(PerformanceShiftAddDto performanceShiftAddDto);
- IPage<Map<String, Object>> performanceShiftPage(Page<Object> page, String time, String userName, String laboratory);
+ Map<String, Object> performanceShiftPage(Page<Object> page, String time, String userName, String laboratory);
- void performanceShiftUpdate(String shift, Integer id);
+ void performanceShiftUpdate(PerformanceShift performanceShift);
}
--
Gitblit v1.9.3