Merge branch 'main' of http://124.243.245.42:3000/zkr/shz-backend

ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java

@@ -598,6 +598,14 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper,AppUser> imple
             List<AppSkill> skillList=appSkillMapper.getList(parmsk);
             appUser.setAppSkillsList(skillList);
 
+            //查询教育经历
+            List<AppUserEducation> educationsList=appUserEducationMapper.selectEducationListByUserId(appUser.getUserId());
+            appUser.setEducationsList(educationsList);
+
+            //查询培训经历
+            List<AppUserTrain> trainsList=appUserTrainMapper.selectTrainListByUserId(appUser.getUserId());
+            appUser.setTrainsList(trainsList);
+
             //查询附件
             File fileParm=new File();
             fileParm.setBussinessid(appUser.getUserId());