Merge branch 'WJC' into wxr4

wxr

2021-04-28 cc48110a814477bc0d01615f9844aea6ff2b609f

 HDL_ON/UI/UI0-Public/PublicAssmebly.cs

@@ -39,10 +39,6 @@
                }
                if (string.IsNullOrEmpty(text) || list.Contains(text))
                {
                    //if (titleId == StringId.ModifyMemberNickname)
                    //{
                    //    return;
                    //}
                    string tipMsgString = "";
                    if (string.IsNullOrEmpty(text))
                    {