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

cdk

7 天以前 f4d5aa97370f698c63b0b9f185f06e7bae56975c

 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 = "";