Merge remote-tracking branch 'origin/master'

fs-service/src/main/java/com/fs/wxcid/vo/wxvo/AddResultWxVo.java

@@ -10,5 +10,6 @@ import lombok.NoArgsConstructor;
 public class AddResultWxVo {
     private String remark;
     private String userName;
+    private String wxid;
     private String bizJson;
 }

fs-wx-api/src/main/java/com/fs/app/websocket/service/WebSocketServer.java

@@ -166,6 +166,7 @@ public class WebSocketServer {
                     WxContact wxContact = wxContactMapper.selectOne(new QueryWrapper<WxContact>().eq("remark", addResultWxVo.getRemark()).eq("friends", 0));
                     log.info("更新联系人：{}", wxContact);
                     wxContact.setFriends(1);
+                    wxContact.setAlias(addResultWxVo.getWxid());
                     wxContactMapper.updateById(wxContact);
                     List<CompanyWxClient> clients = companyWxClientMapper.selectWxV2(companyWxAccount.getId(), wxContact.getPhone());
                     log.info("更新联系人2：{}", clients);