From 430e096780219b81e19043829b637fcda4e61ca1 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 20 八月 2025 17:01:29 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.cs | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.cs b/DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.cs
index d0e8108..ba07020 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.cs
@@ -1,8 +1,8 @@
-锘縰sing System;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
+锘縰sing DevExpress.XtraEditors;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
+using System;
+using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.User
{
@@ -22,29 +22,28 @@
{
if (string.IsNullOrEmpty(txtNewPwd.Text.Trim()))
{
- MsgHelper.Warning("鏂板瘑鐮佷笉鑳戒负绌猴紒");
+ MsgHelper.ShowError("鏂板瘑鐮佷笉鑳戒负绌猴紒");
txtNewPwd.Focus();
return;
}
if (string.IsNullOrEmpty(txtNewPwd2.Text.Trim()))
{
- MsgHelper.Warning("瀵嗙爜涓嶈兘涓虹┖锛�");
+ MsgHelper.ShowError("瀵嗙爜涓嶈兘涓虹┖锛�");
txtNewPwd2.Focus();
return;
}
if (txtNewPwd.Text != txtNewPwd2.Text)
{
- MsgHelper.Warning("浣犵殑涓ゆ瀵嗙爜涓嶄竴鑷达紒");
+ MsgHelper.ShowError("浣犵殑涓ゆ瀵嗙爜涓嶄竴鑷达紒");
txtNewPwd2.Focus();
return;
}
var _obj = new
{
- edtUserGuid = userGuid,
- userGuid,
+ userGuid = userGuid,
newPass = txtNewPwd.Text.Trim()
};
try
@@ -66,7 +65,7 @@
catch (Exception ex)
{
DialogResult = DialogResult.Cancel;
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
--
Gitblit v1.9.3