新增竞彩混合2选1
Merge branch 'master' into lichenxing
Merge branch 'lichenxing' of https://github.com/momoplan/mgr into lichenxing