Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

cdk

9 天以前 3dc0ce85e56e3b3d13ec6ab99409ea8e3c0d9078

 DevApp/Gs.DevApp/DevFrm/QC/Models/MesDefectCode.cs

@@ -84,9 +84,9 @@
        public string SType { get; set; }

        /// <summary>
        /// 类别1 
        /// 状态
        ///</summary>
        public string Type1 { get; set; }
        public bool Type1 { get; set; }

        /// <summary>
        /// 类别2 
@@ -127,15 +127,7 @@
        /// 主表ID 
        ///</summary>
        public Guid? Pid { get; set; }
        
        /// <summary>
        ///     缺陷类别编号
        /// </summary>
        public string TypeNo { get; set; }

        /// <summary>
        ///     缺陷类别描述
        /// </summary>
        public string TypeMemo { get; set; }

    }
}