From aa1eb6c809ef1e0e050bfeac53e9f2ea4f11330c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 18 十二月 2020 21:00:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath
---
HDL_ON/UI/UI0-Public/PublicAssmebly.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
old mode 100755
new mode 100644
index 33894e3..9c76cae
--- a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
@@ -31,10 +31,10 @@
//btnConfirm.IsSelected = false;
if (string.IsNullOrEmpty(editText.Text.Trim()) || list.Contains(editText.Text.Trim()))
{
- if (titleId == StringId.ModifyMemberNickname)
- {
- return;
- }
+ //if (titleId == StringId.ModifyMemberNickname)
+ //{
+ // return;
+ //}
string tipMsgString = "";
if (string.IsNullOrEmpty(editText.Text.Trim()))
{
--
Gitblit v1.8.0