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

cdk

2 天以前 b5dcb53aa7b452d44b4fc19a0c830f86ab9cb5aa

 DevApp/Gs.DevApp/Program.cs

@@ -40,8 +40,8 @@
        /// </summary>
        private static void _startLogin()
        {
            Application.Run(new Gs.DevApp.XtraForm1());
            return;
            //Application.Run(new Gs.DevApp.XtraForm1());
            //return;
            CefSettings settings = new CefSettings();
            settings.Locale = "zh-CN";
            Cef.Initialize(settings);