Merge branch 'zx_saas_director_0927' of http://git.dayaedu.com/yonge/mec into test

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/TempDirectorTrainingCampDetailWrapper.java

@@ -55,6 +55,9 @@ public class TempDirectorTrainingCampDetailWrapper {
 
         @ApiModelProperty(value = "训练营名称")
         private String campName;
+
+        @ApiModelProperty(value = "训练营详情编号")
+        private Integer campDetailId;
     }
 
     @Data

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TempDirectorTrainingCampDetailServiceImpl.java

@@ -179,6 +179,7 @@ public class TempDirectorTrainingCampDetailServiceImpl extends ServiceImpl<TempD
         TempDirectorTrainingCampDetailWrapper.UserPayDetail userPayDetail = new TempDirectorTrainingCampDetailWrapper.UserPayDetail();
         userPayDetail.setCampName(trainingCamp.getName());
         userPayDetail.setUsername(campDetail.getUsername());
+        userPayDetail.setCampDetailId(campDetail.getId());
         return userPayDetail;
     }