Merge remote-tracking branch 'origin/master'

common/src/main/java/com/jpsoft/employment/modules/job/dto/JobUserDTO.java

@@ -18,4 +18,7 @@ public class JobUserDTO {
     @ApiModelProperty(value = "入职工作地")
     private String area;
 
+    //只做显示作用不保存数据库
+    private String resumeDeliverId;
+
 }

web/src/main/java/com/jpsoft/employment/modules/job/controller/ResumeDeliverController.java

@@ -247,6 +247,8 @@ public class ResumeDeliverController {
 
                 JobUserDTO dto = new JobUserDTO();
 
+                dto.setResumeDeliverId(id);
+
                 if(jobUser!=null) {
                     dto.setRealName(jobUser.getRealName());
                     dto.setIdCard(jobUser.getIdCard());