You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
wangsr 8821af772f 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
11 months ago
..
Properties init - 添加项目 11 months ago
bin/Debug change - json识别后插入数据库完成 11 months ago
obj/Debug Merge branch 'master' of http://175.27.215.92:3000/wangsr/EMS.RFID.JsonDataMonitor 11 months ago
BufferAnalysis.cs change - json识别后插入数据库完成 11 months ago
HighWayIot.TouchSocket.csproj change - 更改项目 继承小件 11 months ago
TcpServer.cs change - json识别后插入数据库完成 11 months ago
app.config change - 更改项目 继承小件 11 months ago
packages.config change - 更改项目 继承小件 11 months ago