Merge branch 'developer' into 'master'

Developer

See merge request !98

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java

@@ -457,7 +457,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 				unionId = jt.getString("unionid");
 				relaName = EmojiFilterUtil.filterEmojiLast(jt.getString("name"), true);
 				if(StringUtils.isBlank(relaName)){
-					relaName = "企微会员";
+					relaName = "--";
 				}
 				avatar = jt.getString("avatar");
 			}
@@ -567,7 +567,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 						jt = JSON.parseObject(external_contact);
 						wxName = EmojiFilterUtil.filterEmojiLast(jt.getString("name"), true);
 						if(StringUtils.isBlank(wxName)){
-							wxName = "企微会员";
+							wxName = "--";
 						}
 					}
 					if(StringUtils.isNotBlank(uj_follow_user)){
@@ -878,7 +878,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 				jt = JSON.parseObject(external_contact);
 				name = EmojiFilterUtil.filterEmojiLast(jt.getString("name"), true);
 				if(StringUtils.isBlank(name)){
-					name = "企微会员";
+					name = "--";
 				}
 				avatar = jt.getString("avatar");
 			}
@@ -911,7 +911,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 	public String addExternal(ExternalUserDTO dto) {
 		String wxUserId = dto.getWxUserId();
 		String wxEnterpriseId = dto.getWxEnterpriseId();
-		String name = StringUtils.isBlank(dto.getName())?"企微好友":dto.getName();
+		String name = StringUtils.isBlank(dto.getName())?"--":dto.getName();
 		String createTime = dto.getAddCreateTime();
 		String unionId = dto.getUnionId();
 		String externalUserId = dto.getExternalUserId();