修正ARRIVED fhzs_bnBfb NULL值错误
Merge branch 'master' of https://github.com/benboatZ/JonLong.CRM
warehouse修改
Warehouse shoe='ALL'查询为空及导出文件名修正
Confilict
20140920
Merge branch 'master' of https://github.com/liujianghu/JonLong.CRM
Merge branch 'master' of https://github.com/liujianghu/JonLong.CRM
Merge branch 'master' of https://github.com/liujianghu/JonLong.CRM
Merge branch 'master' of https://github.com/liujianghu/JonLong.CRM
Merge branch 'master' of https://github.com/liujianghu/JonLong.CRM
logo
Merge branch 'master' of https://github.com/liujianghu/JonLong.CRM
Merge branch 'master' of https://github.com/liujianghu/JonLong.CRM
Merge branch 'master' of https://github.com/liujianghu/JonLong.CRM
Merge branch 'master' of https://github.com/liujianghu/JonLong.CRM
Merge branch 'master' of https://github.com/liujianghu/JonLong.CRM
Merge branch 'master' of https://github.com/liujianghu/JonLong.CRM
去除语句中的[jncrm]
Merge branch 'master' of https://github.com/liujianghu/JonLong.CRM

Conflicts:
	JonLong.CRM.BLL/OrderManager.cs