Conflicts:
	common/src/main/java/com/wecloud/im/netty/core/WsReadHandler.java
	common/src/main/java/com/wecloud/im/ws/service/impl/MangerChannelServiceImpl.java
	common/src/main/java/com/wecloud/im/ws/service/impl/WriteDataServiceImpl.java
	common/src/main/java/com/wecloud/im/ws/strategy/concrete/ImChatConcrete.java
	docs/md/内部/wecloud-im前端Websocket对接文档.md
	开发记录.md