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

cdk

4 天以前 b5dcb53aa7b452d44b4fc19a0c830f86ab9cb5aa

 DevApp/Gs.DevApp/UserControl/ShowRptWizard.Designer.cs

@@ -79,7 +79,7 @@
            // 
            // lbParameter
            // 
            this.lbParameter.Appearance.Font = new System.Drawing.Font("Tahoma", 12F);
            
            this.lbParameter.Appearance.Options.UseFont = true;
            this.lbParameter.Location = new System.Drawing.Point(41, 61);
            this.lbParameter.Name = "lbParameter";