Merge remote-tracking branch 'origin/master'

value

2024-05-09 7e51076a4cccc27df31bcdd98ca14c2f9d4928e9

 performance-server/src/main/java/com/yuanchu/mom/service/PerformanceShiftService.java

@@ -6,7 +6,6 @@
import com.yuanchu.mom.dto.PerformanceShiftAddDto;
import com.yuanchu.mom.pojo.PerformanceShift;

import java.time.LocalDateTime;
import java.util.Map;

/**
@@ -21,7 +20,7 @@

    void performanceShiftAdd(PerformanceShiftAddDto performanceShiftAddDto);

    IPage<Map<String, Object>> performanceShiftPage(Page<Object> page, LocalDateTime time, String userName, String laboratory);
    IPage<Map<String, Object>> performanceShiftPage(Page<Object> page, String time, String userName, String laboratory);

    void performanceShiftUpdate(String shift, Integer id);
}