Merge remote-tracking branch 'origin/master'

zhuo

2024-07-23 5ed5f51d479989d5b2149b09c82b6b3ea495b589

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