Merge branch 'dev_optimize_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp

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

@@ -173,6 +173,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 			resultDTO.setDistrict(userBaseInfoResultDTO.getDistrict());
 			resultDTO.setBuildingAddress(userBaseInfoResultDTO.getBuildingAddress());
 			resultDTO.setNickName(userBaseInfoResultDTO.getNickname());
+			resultDTO.setShowName(StrConstant.EPMETY_STR);
 			if (StringUtils.isNotBlank(userBaseInfoResultDTO.getStreet()) && StringUtils.isNotBlank(userBaseInfoResultDTO.getSurname())){
 				String gender = null;
 				if (NumConstant.ONE_STR.equals(userBaseInfoResultDTO.getGender())) {
@@ -185,6 +186,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 				String leaderName = userBaseInfoResultDTO.getStreet().concat(StrConstant.HYPHEN).concat(userBaseInfoResultDTO.getSurname()).concat(gender);
 				resultDTO.setShowName(leaderName);
 			}
+
 			resultDTO.setHeadPhoto(userBaseInfoResultDTO.getHeadImgUrl());
 			return new Result<UserResiInfoResultDTO>().ok(resultDTO);
 		}