Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git
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
导出方法名调整。

Signed-off-by: git1207 <git1302@163.com>
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
增加出库作业功能，未实现；
Merge remote-tracking branch 'refs/remotes/zql/master'
Merge remote-tracking branch 'refs/remotes/zqb/master'
修改打印错误【SRMController 合并错误】；
补充注释
Signed-off-by: git1207 <git1302@163.com>
添加功能按钮图标；
解决异常： The maximum column width for an individual cell is 255 characters.
Signed-off-by: git1207 <git1302@163.com>
NPOI样式调整
Signed-off-by: git1207 <git1302@163.com>
修改错误提示
Signed-off-by: zqloon <zqloon@gmail.com>
增加与中软接口的Web Service，逻缉未实现；