Merge branch 'dev' into test

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamUserController.java

@@ -124,13 +124,15 @@ public class AdamUserController {
         AdamUserInfoVo editVo = adamRdmService.getUserInfoVoByUid(currentUid);
 //        editVo.setAvatar(parameter.getAvatar());
 //        editVo.setBackground(parameter.getBackground());
-        editVo.setAvatar(StringUtils.isEmpty(editVo.getAvatar()) ? avatarDefUrl : editVo.getAvatar());
-        editVo.setBackground(StringUtils.isEmpty(editVo.getBackground()) ? avatarDefUrl : editVo.getBackground());
-        editVo.setNickname(parameter.getNickname());
+//        editVo.setNickname(parameter.getNickname());
+        editVo.setAvatar(editVo.getAvatar());
+        editVo.setBackground(editVo.getBackground());
+        editVo.setNickname(editVo.getNickname());
         editVo.setSex(sex);
         editVo.setBirthday(parameter.getBirthday());
         editVo.setArea(parameter.getArea());
-        editVo.setSignature(parameter.getSignature());
+//        editVo.setSignature(parameter.getSignature());
+        editVo.setSignature(editVo.getSignature());
 //        editVo.setTagMe(tagMeVoList);
         editVo.setUpdatedAt(LocalDateTime.now());
         editVo.setIsComplete(1);