Merge branch 'xiaoyang' into dev

wanshenmean

4 天以前 ff006f77f6267fc0d2c4ee810d897a85165f5b8f

 Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs

@@ -109,7 +109,7 @@
        /// <summary>
        /// 拆盘任务
        /// </summary>
        [Description("换盘任务")]
        [Description("拆盘任务")]
        SplitPallet = 520
    }