Merge branch 'master' of git://github.com/yaojianfeng/wms_rfid.git

Conflicts:
	code/Authority/Wms/Wms.csproj
Merge branch 'master' of git://github.com/Endis/wms_rfid.git

Conflicts:
	code/Authority/Wms/Wms.csproj
Merge branch 'master' of git://github.com/zqb971/wms_rfid.git

Conflicts:
	code/Authority/Wms/Wms.csproj

Signed-off-by: Dong-Yang <772369620@qq.com>