Merge branch 'master' of http://175.27.215.92:3000/wangsr/EMS.RFID.JsonDataMonitor
# Conflicts:
# .vs/HighWayIot/v17/.suo
# HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll
# HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb
# HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll
# HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb
# HighWayIot.TouchSocket/BufferAnalysis.cs
# HighWayIot.TouchSocket/TcpServer.cs
# HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.dll
# HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.pdb
# HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache
# HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.dll
# HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.pdb
|