Merge branch 'master' of ssh://10.10.100.21/source/mes-client

PLCDataReader/ClassFile/ModeBusTCPServer.cs

@@ -111,7 +111,7 @@ namespace ClassFile
                     datashow[i] = data[i];
                 }
                 string str = Encoding.ASCII.GetString(datashow);
-                richtext.AppendText(str + "\n");
+                richtext.AppendText("来自" + socConnection.RemoteEndPoint.ToString() + "的消息:" + str + "\n");
                 LogManager.DoLog(str);
             }
         }

PLCDataReader/MainWindow.cs

@@ -14,7 +14,6 @@ namespace UAS_PLCDataReader
         public MainWindow()
         {
             InitializeComponent();
-          
         }
 
         private void Form1_Load(object sender, EventArgs e)