Merge branch '1.4' into 'upay-test'

修复:获取会话详情接口,MyConversationListVo中的attributes字段为空问题

See merge request !28

common/src/main/java/com/wecloud/im/service/impl/ImConversationServiceImpl.java

@@ -798,7 +798,13 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
 
 
         ImClient client = imClientService.getCurentClient();
         ImClient client = imClientService.getCurentClient();
 
 
-        return this.getImConversationAndMsgCountById(client.getId(), id);
+        MyConversationListVo imConversationAndMsgCountById = this.getImConversationAndMsgCountById(client.getId(), id);
+
+        JsonMapper jsonMapper = new JsonMapper();
+        HashMap attributess = jsonMapper.readValue(imConversationAndMsgCountById.getAttribute(), HashMap.class);
+        imConversationAndMsgCountById.setAttributes(attributess);
+
+        return imConversationAndMsgCountById;
     }
     }
 
 
     @Override
     @Override