Merge branch 'xiaoyang' into dev

wanshenmean

14 小时以前 c9a1df9c19a64844d05d120ff171f523d77e7823

 Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SocketServer/SocketClientGateway.cs

@@ -66,9 +66,9 @@
        /// <param name="cancellationToken">取消令牌</param>
        /// <param name="robotCrane">机器人状态</param>
        /// <returns>任务</returns>
        public Task HandleClientAsync(TcpClient client, string clientId, CancellationToken cancellationToken, RobotSocketState robotCrane)
        public Task HandleClientAsync(TcpClient client, string clientId, CancellationToken cancellationToken)
        {
            return _tcpSocket.HandleClientAsync(client, clientId, cancellationToken, robotCrane);
            return _tcpSocket.HandleClientAsync(client, clientId, cancellationToken);
        }
    }
}