Merge branch 'master' of git://github.com/Endis/wms_rfid.git
改版：NPOI（导出方法）
Signed-off-by: nameseven <git1302@163.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 https://github.com/THOK-SW/wms_rfid.git

Conflicts: 合并...解决冲突
	code/Authority/Wms/Controllers/Wms/Organization/CompanyController.cs

Signed-off-by: nameseven <git1302@163.com>
调整导出调用控制。
Signed-off-by: nameseven <git1302@163.com>
WCS基础信息数据结构修改及SRM模块改动
Signed-off-by: Endis <369029432@qq.com>
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
修改打印错误；