Signed-off-by: zqb <940658539@qq.com>
Merge branch 'master' of git://github.com/git1207/wms_rfid.git

Conflicts:
	code/Authority/Wms/Controllers/Wms/Organization/CompanyController.cs
	code/Authority/Wms/Web.config
Merge branch 'master' of git://github.com/Endis/wms_rfid.git

Conflicts:
	code/Authority/Wms/Controllers/Wms/BasisInfo/SRMController.cs
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git

Conflicts:
	code/Authority/Wms/Web.config
Merge remote-tracking branch 'refs/remotes/zqb/master'