解决代码冲突

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -1015,6 +1015,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             userItem.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames());
             userItem.setParentDeptIds(parentAndAllDeptDTOResult.getData().getParentDeptIds());
             userItem.setParentDeptNames(parentAndAllDeptDTOResult.getData().getParentDeptNames());
+            userItem.setSex(IdentityNoUtils.getSex(userItem.getIdentityNo()));
+            userItem.setBirthday(DateUtils.parse(IdentityNoUtils.getBirthday(userItem.getIdentityNo()), DateUtils.DATE_PATTERN));
         }
         // 插入用户表
         insertBatch(userEntities);