Merge remote-tracking branch 'origin/master'

rwk-admin/src/main/java/com/rwk/web/controller/ability/RwkStaffInformationController.java

@@ -74,6 +74,7 @@ public class RwkStaffInformationController extends BaseController
         mmap.put("achievementLines",achievementLines);
         //获取当前人员的培训记录消息
         getTrainingRecord(rwkStaffInformation,mmap);
+
         return prefix + "/informationView";
     }
 
@@ -101,6 +102,7 @@ public class RwkStaffInformationController extends BaseController
     {
         List<RwkStaffInformation> list = rwkStaffInformationService.selectRwkStaffInformationList(rwkStaffInformation);
         ExcelUtil<RwkStaffInformation> util = new ExcelUtil<RwkStaffInformation>(RwkStaffInformation.class);
+
         return util.exportExcel(list, "人员信息数据");
     }