修改支持小品种及异型烟固定拆盘位；（BUG修复）
Merge remote-tracking branch 'refs/remotes/thok-sw/mdj' into mdj