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

cdk

3 天以前 b5dcb53aa7b452d44b4fc19a0c830f86ab9cb5aa

 DevApp/Gs.DevApp/UserControl/SelectCgMx.cs

@@ -59,7 +59,6 @@
                getPageList(1);
                getPageListSrm(1);
            };

            /////////
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView2, null, null, null, "", null, null, false);
            getPageListSrm(1);