fixbug
Merge branch '合并购买最多10个' into dev