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

lu

9 天以前 800f1652b2ed0473850975efe5028685bcd605c4

 DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs

@@ -505,7 +505,7 @@
            // gridColumn5
            // 
            this.gridColumn5.Caption = "检验状态";
            this.gridColumn5.FieldName = "checkStates";
            this.gridColumn5.FieldName = "txtColor";
            this.gridColumn5.MinWidth = 25;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;