Merge remote-tracking branch 'origin/dev_move_out_of' into dev_move_out_of

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java

@@ -181,6 +181,8 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
                     formDto.setGender("0");
                 } else if ("男".equals(dto.getGender())) {
                     formDto.setGender("1");
+                } else {
+                    formDto.setGender("2");
                 }
             }
             formDto.setJoinReason("迁出人员选定");

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java

@@ -150,6 +150,7 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl<ChangeWelfareDao,
             return new Result().error("该人员已经迁入福利人口");
         }
         dto.setJoinDate(DateUtils.format(new Date()));
+        dto.setId(StringUtils.EMPTY);
         ChangeWelfareEntity entity = ConvertUtils.sourceToTarget(dto, ChangeWelfareEntity.class);
         insert(entity);
         return new Result();