Merge branch 'dev_perfect_rent_field'

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

@@ -2196,7 +2196,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             images.forEach(item -> icResiUserAttachmentService.save(item));
             // 如果是已经存在的居民，并且是租客状态，需要更新原本的状态
             if (NumConstant.ONE_STR.equals(formDTO.getType())) {
-                IcResiUserEntity entity = new IcResiUserEntity();
+//                IcResiUserEntity entity = new IcResiUserEntity();
+                IcResiUserEntity entity = ConvertUtils.sourceToTarget(formDTO.getUser(), IcResiUserEntity.class);
                 entity.setId(resiUserId);
                 entity.setIsTenant(NumConstant.ONE_STR);
                 entity.setIsFloating(NumConstant.ONE_STR);