添加合并单元格的条件；
修改完成，按分拣线烟道顺序打印分拣备货区库区信息；修改排序；修改数据库结构文档 ；
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git

Conflicts:
	code/Authority/THOK.Wms.AutomotiveSystems/Models/BillDetail.cs
	code/THOK.WES/THOK.WES/THOK.WES.Interface/Model/BillDetail.cs