Merge remote-tracking branch 'refs/remotes/zqb/master'

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

Conflicts:
	code/Authority/Wms/Controllers/Wms/Organization/CompanyController.cs
Merge remote-tracking branch 'refs/remotes/zzb/master'

Conflicts:
	code/Authority/Wms/Controllers/Wms/BasisInfo/SRMController.cs
	code/Authority/Wms/Web.config
修改打印错误；
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git

Conflicts:
	code/Authority/Wms/Web.config