From 7e51076a4cccc27df31bcdd98ca14c2f9d4928e9 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 09 五月 2024 07:27:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
performance-server/src/main/java/com/yuanchu/mom/mapper/PerformanceShiftMapper.java | 7 +++----
1 files changed, 3 insertions(+), 4 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 3f54661..e923efa 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
@@ -2,11 +2,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.mybatis_config.MyBaseMapper;
import com.yuanchu.mom.pojo.PerformanceShift;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.data.repository.query.Param;
-import java.time.LocalDateTime;
import java.util.Map;
/**
@@ -17,11 +16,11 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2024-05-08 09:12:04
*/
-public interface PerformanceShiftMapper extends BaseMapper<PerformanceShift> {
+public interface PerformanceShiftMapper extends MyBaseMapper<PerformanceShift> {
IPage<Map<String, Object>> performanceShiftPage(
Page<Object> page,
- @Param("time") LocalDateTime time,
+ @Param("time") String time,
@Param("userName") String userName,
@Param("laboratory") String laboratory
);
--
Gitblit v1.9.3