Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb

zhuo

2025-04-17 f67aa8b146f0fa901ce4ae183be511d8615cde77

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

@@ -63,5 +63,5 @@
     * @param trainingDate
     * @return
     */
    List<TrainingRecordPersonDetailedDto> selectPersonDetailedDtosByTrainingDate(Integer userId, Integer year);
    List<TrainingRecordPersonDetailedDto> selectPersonDetailedDtosByTrainingDate(@Param("userId") Integer userId, @Param("year") Integer year);
}