From 550cb6847bf4c8586bd5430b10ac9d25e8469f5a Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 05 九月 2025 11:18:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/FrmLogin.cs | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
index d1089b6..c08ef43 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
@@ -1,6 +1,5 @@
锘縰sing AutoUpdaterDotNET;
using DevExpress.XtraEditors;
-using DevExpress.XtraRichEdit.Export.Rtf;
using Gs.DevApp.Entity;
using Gs.DevApp.Properties;
using Gs.DevApp.ToolBox;
@@ -35,7 +34,7 @@
_getRemember();
btnLogin.Click += BtnLogin_Click;
btnCancel.Click += BtnCancel_Click;
- lbVersion.Text = _productName+ "锛岀増鏈�(" + _version + ")" + "锛屼娇鐢ㄥ瓧浣�(" + _strFont + ")"+"锛屾湇鍔″湴鍧�("+ _webApiUrl + ")";
+ lbVersion.Text = _productName + "锛岀増鏈�(" + _version + ")" + "锛屼娇鐢ㄥ瓧浣�(" + _strFont + ")" + "锛屾湇鍔″湴鍧�(" + _webApiUrl + ")";
}
private void BtnCancel_Click(object sender, EventArgs e)
@@ -100,12 +99,9 @@
{
try
{
- if (Settings.Default.remember)
- {
- txtUser.Text = Settings.Default.userName;
- txtPwd.Text = Settings.Default.userPwd;
- ckRemember.Checked = true;
- }
+ txtUser.Text = Settings.Default.userName;
+ txtPwd.Text = Settings.Default.userPwd;
+ ckRemember.Checked = Settings.Default.remember;
}
catch (Exception ex)
{
--
Gitblit v1.9.3