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

Conflicts:
	code/Authority/Wms/Wms.csproj

Signed-off-by: Endis <369029432@qq.com>