Merge branch 'dev' of xiongzhu/raex_back into master

src/main/java/com/izouma/nineth/web/UserDetailController.java

@@ -7,7 +7,6 @@ import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.UserDetailRepo;
 import com.izouma.nineth.service.ContentAuditService;
 import com.izouma.nineth.service.UserDetailService;
-import com.izouma.nineth.utils.ObjUtils;
 import com.izouma.nineth.utils.excel.ExcelUtils;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
@@ -36,11 +35,6 @@ public class UserDetailController extends BaseController {
                 throw new BusinessException("简介包含非法内容");
             }
         }
-        if (record.getUserId() != null) {
-            UserDetail orig = userDetailRepo.findById(record.getUserId()).orElseThrow(new BusinessException("无记录"));
-            ObjUtils.merge(orig, record);
-            return userDetailRepo.save(orig);
-        }
         return userDetailRepo.save(record);
     }