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

kyy

6 天以前 9010fdfa1f7f6fe29c76111ef95d6383c74ea313

 DevApp/Gs.DevApp/Program.cs

@@ -55,8 +55,8 @@
                fmLogin.ShowDialog();
                if (fmLogin.DialogResult == DialogResult.OK)
                {
                    //Application.Run(new DevFrm.User.SysMenu());
                    //return;
                  /*  Application.Run(new DevFrm.User.SysMenu());
                    return;*/
                    bool IsWeight = false;
                    try
                    {