Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient

lu

2024-11-11 acb4d0f2ee702dadf3656126fa7c4feae03c0357

 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs

@@ -393,7 +393,7 @@
            if (_bl)
            {
                var frm = new RptPreview(guidKey, rptParameter);
                frm.Show();
                frm.ShowDialog();
                return;
            }

@@ -418,7 +418,7 @@
            if (_bl)
            {
                var frm = new EasyRptDesign(guidKey, rptParameter);
                frm.Show();
                frm.ShowDialog();
                return;
            }
            //否则向导设计模板