Merge branch 'dev_zj' into dev

zss

2025-02-28 7d2330819e11cc505d3721373af34263f5c2fc16

 cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingRecordMapper.java

@@ -21,7 +21,7 @@
 */
public interface PersonTrainingRecordMapper extends BaseMapper<PersonTrainingRecord> {

    List<PersonTrainingRecordDto> trainingAndAssessmentRecordsPage(Integer trainingDetailedId, String userName);
    List<PersonTrainingRecordDto> trainingAndAssessmentRecordsPage(@Param("trainingDetailedId") Integer trainingDetailedId,@Param("userName") String userName);

    IPage<PersonTrainingRecordListDto> personnelTrainingPersonnel(Page page, String userName, Integer userId, Integer departLimsId);