Merge branch 'xiaoyang' into dev

wanshenmean

3 天以前 ff006f77f6267fc0d2c4ee810d897a85165f5b8f

 Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/ConveyorLine/Enum/ConveyorLineStatus.cs

@@ -22,6 +22,12 @@
        /// 是否被占用
        /// </summary>
        [Description("是否被占用")]
        IsOccupied
        IsOccupied,

        /// <summary>
        /// 是否被占用
        /// </summary>
        [Description("是否被占用")]
        CV_State
    }
}