Merge remote-tracking branch 'origin/master'

zss

2024-07-26 ff4d45d57c3d1a1c8d4218dd83023cb7e4c34d7e

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

@@ -30,4 +30,12 @@
    List<Map<String, Object>> performanceShiftYearPage(@Param("time") String time,
                                                       @Param("userName") String userName,
                                                       @Param("laboratory") String laboratory);

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

    String seldepLimsId(int depLimsId);
}