Merge branch 'xiaoyang' into dev

wanshenmean

20 小时以前 2db17e312a9bf0cff60917104447260b86178ca2

 Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/DTO/DeviceProtocolDetailDTO.cs

@@ -29,6 +29,11 @@
    public class DeviceProtocolDetailDTO
    {
        /// <summary>
        /// 设备ID
        /// </summary>
        public int DeviceId { get; set; }

        /// <summary>
        /// 设备类型
        /// </summary>
        public string DeviceType { get; set; }