Merge branch 'dev' into master

wanshenmean

9 天以前 151e8398189310f1b06d17c874aa7c4c45ba811a

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