Merge remote-tracking branch 'origin/master'

zss

2024-06-07 49cc211213ce71bd6e5bb8eeeffbda46c0bf98d8

 performance-server/src/main/java/com/yuanchu/mom/mapper/PerformanceShiftMapper.java

@@ -34,4 +34,6 @@
    IPage<Map<String, Object>> performanceShiftYear(Page<Object> page, String time, String userName, String laboratory);

    List<Map<String, Object>> performanceShiftYearList(String time, String userName, String laboratory);

    List<PerformanceShiftMapDto> performanceShiftList(String time, String userName, String laboratory);
}