Merge branch 'dev' of https://gitee.com/mathay/shanmeixinnengyuan into dev

wanshenmean

9 天以前 171066410620b720e09d9e4ee11b7faef3649045

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

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

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