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

lu

10 天以前 1c8df1e24fcf4a18c1d96ec6f6821d24313d73aa

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.Designer.cs

@@ -107,6 +107,7 @@
            // 
            // txt_type1
            // 
            this.txt_type1.EditValue = true;
            this.txt_type1.Location = new System.Drawing.Point(12, 211);
            this.txt_type1.Name = "txt_type1";
            this.txt_type1.Properties.Caption = "可用标识";