固定商品池混合排序
Merge branch 'master' of https://github.com/xiangyu85/openta

Conflicts:

target/classes/com/tencent/openta/processor/NewBaselineCronBolt$ThreadPo
olTask.class