Merge branch 'WJC' into wxr6

wxr

2021-11-18 a7885a24a152a164d7e26b12098ab92a0e272f24

 HDL_ON/DAL/DriverLayer/UdpSocket.cs

@@ -135,7 +135,7 @@
            //mqtt连接数据读取  A协议网络设备信息读取回复 处理
            if (((IPEndPoint)packet.RemoteEndPoint).Port == 8585)
            {
               Control.Ins.ConvertReceiveData(bytes);
               Control.Ins.ConvertReceiveData(bytes, ((IPEndPoint)packet.RemoteEndPoint).Address.ToString());
            }
            else if(((IPEndPoint)packet.RemoteEndPoint).Port == 6000)//处理bus 6000端口的数据
            {