修改混合烟道的查询
Merge remote-tracking branch 'zys/master'