Merge branch 'master' of git://github.com/zqloon/wms_rfid.git

Conflicts:
	code/Authority/Wms/Web.config
	code/Authority/Wms/Wms.csproj
Merge branch 'master' of git://github.com/zqloon/wms_rfid.git

Conflicts:
	code/Authority/Wms/Wms.csproj

Signed-off-by: Endis <369029432@qq.com>
导出EXCEL 设置所有内容列整型格式，也可以通过数据访问层“类型”来改变内容格式
Signed-off-by: nameseven <git1302@163.com>
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