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

cdk

6 天以前 1f99c554ffc67f599fbce5981a3da584945b3b16

 DevApp/Gs.DevApp/DevFrm/FrmLogin.cs

@@ -109,7 +109,6 @@
            {
                MsgHelper.ShowError("提示：" + ex.Message);
            }
          
        }
        /// <summary>
        /// 读取字体