Merge branch 'xiaoyang' into dev

wanshenmean

16 小时以前 e4921e003cc293fea714bdaf74dc6a6b6b750295

 Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/IRobotTaskService.cs

@@ -54,6 +54,7 @@
        /// </summary>
        public List<int> TaskRobotTypes { get; }

        public bool DeleteRobotTask(int id);

        public Dt_RobotTask? QueryRobotCraneTask(string deviceCode);