Merge remote-tracking branch 'refs/remotes/git1207.com/mdj' into mdj
调度取整修改，下载卷烟信息修改，结单修改
Merge remote-tracking branch 'refs/remotes/loou/mdj' into mdj