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

cdk

3 天以前 b5dcb53aa7b452d44b4fc19a0c830f86ab9cb5aa

 DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.Designer.cs

@@ -55,7 +55,6 @@
            // environmentSettings1
            // 
            designerSettings2.ApplicationConnection = null;
            designerSettings2.DefaultFont = new System.Drawing.Font("宋体", 9F);
            designerSettings2.Icon = null;
            designerSettings2.Restrictions = designerRestrictions2;
            designerSettings2.Text = "";