Merge branch 'master' of git://github.com/Endis/wms_rfid.git
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
修改登录验证bug
Signed-off-by: zqloon <zqloon@gmail.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
Merge remote-tracking branch 'refs/remotes/zql/master'
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
Merge branch 'master' of git://github.com/Endis/wms_rfid.git

Conflicts:
	code/Authority/Wms/Controllers/Wms/BasisInfo/SRMController.cs
修改打印错误；
修改获取客户端ip方法
Signed-off-by: zqloon <zqloon@gmail.com>
Merge remote-tracking branch 'refs/remotes/ljj/master'
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git

Conflicts:
	code/Authority/Wms/Controllers/HomeController.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
增加出库作业功能，未实现；