Merge branch 'xiaoyang' into dev

wanshenmean

7 小时以前 e4921e003cc293fea714bdaf74dc6a6b6b750295

 Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/RobotTaskProcessor.cs

@@ -79,7 +79,7 @@
        /// <summary>
        /// 日志记录器
        /// </summary>
        private readonly ILogger _logger;
        private readonly ILogger _logger;


        /// <summary>
        /// 构造函数
@@ -146,7 +146,7 @@
        /// <returns>删除是否成功</returns>
        public bool? DeleteTask(int ID)
        {
            return _robotTaskService.Repository.DeleteDataById(ID);
            return _robotTaskService.DeleteRobotTask(ID);
        }

        /// <summary>