Merge remote-tracking branch 'origin/master'

value

2024-05-09 7e51076a4cccc27df31bcdd98ca14c2f9d4928e9

 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
    );