Merge branch 'dev_cr' into dev

zhuo

2025-02-28 217e39bec2ae2a861c4619d277ab0bc823cf85d4

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

@@ -20,11 +20,12 @@
public interface PersonTrainingDetailedMapper extends MyBaseMapper<PersonTrainingDetailed> {

    IPage<PersonTrainingDetailedDto> queryTheAnnualPlanDetailsTable(Page page,
                                                                    String trainingLecturerName,
                                                                    String courseCode, String trainingDate,
                                                                    Integer id,
                                                                    Integer userId,
                                                                    Integer loginUserId);
                                                                    @Param("trainingLecturerName") String trainingLecturerName,
                                                                    @Param("courseCode") String courseCode,
                                                                    @Param("trainingDate") String trainingDate,
                                                                    @Param("id") Integer id,
                                                                    @Param("userId") Integer userId,
                                                                    @Param("loginUserId") Integer loginUserId);

    /**
     * 根据主表id查询详情