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

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

Conflicts:
	code/Authority/Wms/Wms.csproj
关闭浏览器退出登录（目前支持IE）
Signed-off-by: zqloon <zqloon@gmail.com>
修改帮助页面显示错误，用户在线状态验证，异常处理，
Merge remote-tracking branch 'refs/remotes/zql/master'

Conflicts:
	code/Authority/Wms/Content/Scripts/jquery.ajaxsetup.js
	code/Authority/Wms/Wms.csproj
Merge remote-tracking branch 'refs/remotes/zzb/master'

Conflicts:
	code/Authority/Wms/Content/Scripts/jquery.ajaxsetup.js
	code/Authority/Wms/Wms.csproj
Merge remote-tracking branch 'refs/remotes/zqb/master'
Merge remote-tracking branch 'refs/remotes/ljj/master'
修改菜单初始化；
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>
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
WCS基础信息数据结构修改及SRM模块改动
Signed-off-by: Endis <369029432@qq.com>
Merge branch 'master' of git://github.com/Endis/wms_rfid.git

Conflicts:
	code/Authority/Wms/Controllers/Wms/BasisInfo/SRMController.cs