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

cdk

3 天以前 ae28c33700e413d5acf60d1e48bbc9870bdef5a5

 DevApp/Gs.DevApp/UserControl/UcDictionary.cs

@@ -62,7 +62,8 @@
                foreach (dynamic dym in lst)
                {
                    if (stringBuilder.Length > 0)
                        stringBuilder.Append("|");
                        // stringBuilder.Append("|");//|和~已被占用
                        stringBuilder.Append("&");
                    stringBuilder.Append(dym.dicTxt);
                }
                this.TextTxt = stringBuilder.ToString();