Merge branch 'dev' into xiaoyang

wanshenmean

3 天以前 ef57389fd66aca85d6fb4a73c0f7c1c1f7d607b2

 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);